summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-06-27 12:11:28 -0300
committerTomás Touceda <chiiph@leap.se>2014-06-27 12:11:28 -0300
commit2628bbf4c5faff50491cdd227c787ca7f148f368 (patch)
treec720980423ef4e02e0461ff81f173d4396ecce51
parent0e7554add298ca582248ebfe8bc6e548568ebee5 (diff)
parent03b4ed07d1c55770d9c5b0ed8e7d42dd08f80272 (diff)
Merge branch 'master' into develop
-rw-r--r--CHANGELOG17
-rw-r--r--client/changes/bug_reset-synchronizer-state2
-rw-r--r--client/changes/feature_5571_add-sync-status-signals1
-rw-r--r--client/changes/feature_5571_allow-for-interrupting-and-recovering-sync1
-rw-r--r--client/changes/feature_5571_split-sync-post1
-rw-r--r--common/changes/bug_5739_fix-multipart-problem2
-rw-r--r--server/changes/feature_5571_allow-for-interrupting-and-recovering-sync1
-rw-r--r--server/changes/feature_5571_split-sync-post1
-rw-r--r--soledad_server/changes/feature_3399-check-auth-in-constant-way1
9 files changed, 17 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ff1ba240..768e31af 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,20 @@
+0.5.2 Jun 6, 2014:
+Client:
+ o Reset synchronizer state in order to reuse the same synchronizer
+ object multiple times.
+ o Add sync status signals. Closes #5517.
+ o Allow for interrupting and recovering sync. Closes #5517.
+ 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
+ bug. Fixes #5739.
+
+Server:
+ o Allow for interrupting and recovering sync. Closes #5517.
+ o Split sync in multiple POST requests in server. Closes #5571.
+ o Authenticate in time-insensitive manner. Closes #3399.
+
0.5.1 May 16, 2014:
Client:
o Close connection with server after syncing to avoid client hanging
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_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_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/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).
diff --git a/soledad_server/changes/feature_3399-check-auth-in-constant-way b/soledad_server/changes/feature_3399-check-auth-in-constant-way
deleted file mode 100644
index ebd18680..00000000
--- a/soledad_server/changes/feature_3399-check-auth-in-constant-way
+++ /dev/null
@@ -1 +0,0 @@
- o Authenticate in time-insensitive manner. Closes #3399.