Fold in changes

13 files changed, 23 insertions, 15 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 768e31af..0dce4847 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+0.6.0 Jul 18, 2014:
+Client:
+  o Close all connections after syncing. Fixes #5518.
+  o Reset synchronizer state in order to reuse the same synchronizer
+    object multiple times.
+  o Use temporal database for encryption/decryption during
+    sync. Closes #5326.
+  o Add sync status signals. Closes #5517.
+  o Allow for interrupting and recovering sync. Closes #5517.
+  o Parallelize sync requests and reuse HTTP connections.
+  o Split sync in multiple POST requests in client. Closes #5571.
+
+Common:
+  o Use a dedicated HTTP resource for couch multipart PUTs to avoid
+    bigcouch. Closes #5739.
+
+Server:
+  o Pin PyOpenSSL dependency version to <0.14 to avoid yet another
+    crypto dependency.
+  o Authenticate in time-insensitive manner. Closes #3399.
+  o Allow for interrupting and recovering sync. Closes #5517.
+  o Split sync in multiple POST requests in server. Closes #5571.
+
 0.5.2 Jun 6, 2014:
 Client:
   o Reset synchronizer state in order to reuse the same synchronizer
diff --git a/client/changes/bug_5518_close-all-connections-after-sync b/client/changes/bug_5518_close-all-connections-after-sync
deleted file mode 100644
index 46d679a6..00000000
--- a/client/changes/bug_5518_close-all-connections-after-sync
+++ /dev/null
@@ -1 +0,0 @@
-  o Close all connections after syncing (#5518).
diff --git a/client/changes/bug_reset-synchronizer-state b/client/changes/bug_reset-synchronizer-state
deleted file mode 100644
index 9678b36b..00000000
--- a/client/changes/bug_reset-synchronizer-state
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Reset synchronizer state in order to reuse the same synchronizer object
-    multiple times.
diff --git a/client/changes/feature_5326_use-transitional-db-for-sync b/client/changes/feature_5326_use-transitional-db-for-sync
deleted file mode 100644
index 7d66141d..00000000
--- a/client/changes/feature_5326_use-transitional-db-for-sync
+++ /dev/null
@@ -1 +0,0 @@
-  o Use temporal database for encryption/decryption during sync. Closes: #5326
diff --git a/client/changes/feature_5571_add-sync-status-signals b/client/changes/feature_5571_add-sync-status-signals
deleted file mode 100644
index 67bc7d9f..00000000
--- a/client/changes/feature_5571_add-sync-status-signals
+++ /dev/null
@@ -1 +0,0 @@
-  o Add sync status signals (#5517).
diff --git a/client/changes/feature_5571_allow-for-interrupting-and-recovering-sync b/client/changes/feature_5571_allow-for-interrupting-and-recovering-sync
deleted file mode 100644
index 0087c535..00000000
--- a/client/changes/feature_5571_allow-for-interrupting-and-recovering-sync
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow for interrupting and recovering sync (#5517).
diff --git a/client/changes/feature_5571_parallelize-requests b/client/changes/feature_5571_parallelize-requests
deleted file mode 100644
index ec394cdc..00000000
--- a/client/changes/feature_5571_parallelize-requests
+++ /dev/null
@@ -1 +0,0 @@
-  o Parallelize sync requests and reuse HTTP connections.
diff --git a/client/changes/feature_5571_split-sync-post b/client/changes/feature_5571_split-sync-post
deleted file mode 100644
index 0d7b14dd..00000000
--- a/client/changes/feature_5571_split-sync-post
+++ /dev/null
@@ -1 +0,0 @@
-  o Split sync in multiple POST requests in client (#5571).
diff --git a/common/changes/bug_5739_fix-multipart-problem b/common/changes/bug_5739_fix-multipart-problem
deleted file mode 100644
index 449e09b8..00000000
--- a/common/changes/bug_5739_fix-multipart-problem
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Use a dedicated HTTP resource for couch multipart PUTs to avoid bigcouch
-    bug (#5739).
diff --git a/server/changes/bug_5368_avoid-yet-another-crypto-dep b/server/changes/bug_5368_avoid-yet-another-crypto-dep
deleted file mode 100644
index 6f3f2b04..00000000
--- a/server/changes/bug_5368_avoid-yet-another-crypto-dep
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Pin PyOpenSSL dependency version to <0.14 to avoid yet another crypto
-    dependency.
diff --git a/server/changes/feature_3399-check-auth-in-constant-way b/server/changes/feature_3399-check-auth-in-constant-way
deleted file mode 100644
index ebd18680..00000000
--- a/server/changes/feature_3399-check-auth-in-constant-way
+++ /dev/null
@@ -1 +0,0 @@
-  o Authenticate in time-insensitive manner. Closes #3399.
diff --git a/server/changes/feature_5571_allow-for-interrupting-and-recovering-sync b/server/changes/feature_5571_allow-for-interrupting-and-recovering-sync
deleted file mode 100644
index 0087c535..00000000
--- a/server/changes/feature_5571_allow-for-interrupting-and-recovering-sync
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow for interrupting and recovering sync (#5517).
diff --git a/server/changes/feature_5571_split-sync-post b/server/changes/feature_5571_split-sync-post
deleted file mode 100644
index ad269cd4..00000000
--- a/server/changes/feature_5571_split-sync-post
+++ /dev/null
@@ -1 +0,0 @@
-  o Split sync in multiple POST requests in server (#5571).