1.6.0rc1v1.6.0-rc1

2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index c12028ea3..8eedbca4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,13 +6,17 @@ version 1.6.0 (release 2014-04- )
  * Ignore sync log file in filewatcher
  * Install libocsync to private library dir and use rpath to localize
  * Fix reconnect after server disconnect
- * Fix crashes
  * Fix "unknown action" display in Activity window
  * Fix memory leaks
  * Respect XDG_CONFIG_HOME environment var
  * Handle empty fileids in the journal correctly
  * Add abilility to compile libowncloudsync without GUI dependendy
-
+ * Fix SSL error with previously-expired CAs on Windows
+ * Fix incorrect folder pause state after start
+ * Fix a couple of actual potential crashes
+ * Improve Cookie support (e.g. for cookie-based load-balancers)
+ * Introduce a general timeout of 300s for network operations
+ * Improve error handling, blacklisting
  * Job-based change propagation, enables faster parallel up/downloads 
    (right now only if no bandwidth limit is set and no proxy is used)
  * Significantly reduced CPU load when checking for local and remote changes
diff --git a/VERSION.cmake b/VERSION.cmake
index 98f006a54..855c8e6a7 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -4,7 +4,7 @@ set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )
 
 if ( NOT DEFINED MIRALL_VERSION_SUFFIX )
-    set( MIRALL_VERSION_SUFFIX "beta2" ) #e.g. beta1, beta2, rc1
+    set( MIRALL_VERSION_SUFFIX "rc1" ) #e.g. beta1, beta2, rc1
 endif( NOT DEFINED MIRALL_VERSION_SUFFIX )
 
 if( NOT DEFINED MIRALL_VERSION_BUILD )