From 0a1cab6609a39cd425d85ccdcc20f46f3d65d1e4 Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Thu, 24 Apr 2014 13:33:07 +0200
Subject: [PATCH] updating changelog

---
 ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bd344e7..dca58b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+??-??-????: 2.1.6 or 2.2.0
+	enhancement: Lsyncd now locks its pidfile
+	enhancement: Lsyncd adding ssh.identifyFile and ssh.options options
+	fix: ignore blank lines and rsync commens in exclude files (David Reiss)
+	fix: don't tread exclude lines with embedded "+" chars as inclusions (David Reiss)
+	fix: crash when debugging inotify (Michael Ploujnikov)
+	fix: fixed Finished/Retrying error messages being swapped around (Jun Saito)
+	change: closes also on INT signals
+	change: now removes its pidfile on INT and TERM signals
+
 07-06-2013: 2.1.5
 	enhancement: Added rsync options: bwlimit, timeout
 	fix: Specifying ssh port no longer overwrites the last rsync option