Add ChangeLog for 2.2.1

diff --git a/ChangeLog b/ChangeLog
index 127e65903cd25b3a4ba97379b05761df332247e8..afff099ad53fbceb67ffda5685e2c379b20ca2aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 ChangeLog
 =========
+version 2.2.1 (release 2016-05-xx)
+ * Fix out of memory error when too many uploads happen (#4611)
+ * Fix display errors in progress display (#4803 #4856)
+ * LockWatcher: Remember to upload files after they become unlocked (#4865) 
+
 version 2.2.0 (release 2016-05-12)
  * Overlay icons: Refactoring - mainly for performance improvements
  * Improved error handling with Sync Journal on USB storages (#4632)