Fold in changes

33 files changed, 66 insertions, 49 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 83bb883e..a1876ef2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,69 @@
+0.4.5 Apr 4:
+Client:
+  o Catch lock timeout exception. Fixes #4435.
+  o Add lock for create_doc and update_indexes call, prevents
+    concurrent access to the db. Closes #5139.
+  o Back-compatibility for socket.create_connection interface in
+    2.6. Closes #5208.
+  o Always return unicode in helper method, even on
+    UnicodeError. Related to #4998.
+  o Fix a bug in soledad.client.sqlcipher by which we were creating a
+    new connection for each sync.
+  o Unlock shared_db if anything fails in the bootstrap
+    sequence. Fixes #4702.
+  o Avoid concurrent syncs for the same account, but allow for
+    distinct accounts. Fixes #4451.
+  o Adds a get_count_by_index to sqlcipher u1db backend. Related to:
+    #4616.
+  o Do not autocreate remote user database when syncing. Tapicero
+    should make sure that that db is created when the user is
+    created. Closes #5302.
+  o Add a read-write lock for all client operations. Addresses: #4972
+  o Add sync=off and tem_store=mem to soledad client, for
+    optimization.
+
+Common:
+  o Add lock timeout HTTP error. Fixes #4435.
+  o Remodel couch backend to fix concurrency and scalability. Closes
+    #4475, #4682, #4683 and #4680.
+  o Remove check for design docs on couch server state initialization
+    Closes #5387.
+  o Renew HTTP session after multipart PUTs to avoid request hanging.
+    Fixes #5449.
+  o Preload time.strptime() to avoid multi-threaded problem on couch
+    backend get_docs() method. Fixes #5449.
+  o Improve error messages. Closes #5035.
+  o Add MissingTokenError and InvalidTokenError as sub exceptions
+    from Unauthorized.
+  o Allow sync of large files (~100MB). Closes #4836.
+  o Add exceptions to deal with missing design documents. Fixes #4994.
+  o Parallelize get_docs() on couch backend to accelerate sync.
+    Closes #5008.
+  o Use less memory when putting docs on couch. Fixes #5011.
+  o Prevent CouchServerState from creating or deleting databases. This
+    way, Soledad remote clients won't ever be able to do these
+    operations when syncing. Part of #5302.
+  o Avoid concurrent syncs problem by adding a lock for PUTting to the
+    sync log update handler. Fixes #5388.
+  o Remove check for couch permissions when CouchServerState is
+    instantiated. This is not necessary anymore because platform
+    takes care of giving the soledad user enough permissions and
+    tapicero takes care of uploading the needed design documents.
+
+Server:
+  o Send propper lock timeout response. Fixes #4435.
+  o Fix raising of auth token errors. Fixes #5191.
+  o Allow sync of large files (~100MB). Closes #4836.
+  o Use a temporary directory for server side locks. Fixes #4918.
+  o Catch couchdb.http.ResourceNotFound exceptions when accessing
+    design documents on couch backend, and raise appropriate missing
+    design documents exceptions. Fixes #4994.
+  o Do not try to create the shared database when running the Soledad
+    Server application. Fixes #5302.
+  o Enable Gzip compression on the soledad wsgi app.
+
+-- 2014 --
+
 0.4.4 Dec 6:
 Client:
   o Add MAC verirication to the recovery document and
diff --git a/client/changes/bug_4435_catch-lock-timeout-exception b/client/changes/bug_4435_catch-lock-timeout-exception
deleted file mode 100644
index 12c05685..00000000
--- a/client/changes/bug_4435_catch-lock-timeout-exception
+++ /dev/null
@@ -1 +0,0 @@
-  o Catch lock timeout exception (#4435).
diff --git a/client/changes/bug_5139-interface-error b/client/changes/bug_5139-interface-error
deleted file mode 100644
index 9127e70b..00000000
--- a/client/changes/bug_5139-interface-error
+++ /dev/null
@@ -1,2 +0,0 @@
-o Add lock for create_doc and update_indexes call,
-  prevents concurrent access to the db. Closes #5139.
diff --git a/client/changes/bug_5208_support_socket_26 b/client/changes/bug_5208_support_socket_26
deleted file mode 100644
index b44d1d4e..00000000
--- a/client/changes/bug_5208_support_socket_26
+++ /dev/null
@@ -1 +0,0 @@
-  o Back-compatibility for socket.create_connection interface in 2.6. Closes: #5208
diff --git a/client/changes/bug_return-always-unicode b/client/changes/bug_return-always-unicode
deleted file mode 100644
index f4ee51ed..00000000
--- a/client/changes/bug_return-always-unicode
+++ /dev/null
@@ -1 +0,0 @@
-  o Always return unicode in helper method, even on UnicodeError. Related to #4998.
diff --git a/client/changes/bug_reuse-http-connection b/client/changes/bug_reuse-http-connection
deleted file mode 100644
index c6cdd9b4..00000000
--- a/client/changes/bug_reuse-http-connection
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Fix a bug in soledad.client.sqlcipher by which we were creating
-    a new connection for each sync.
diff --git a/client/changes/bug_unlock_shared_if_fails b/client/changes/bug_unlock_shared_if_fails
deleted file mode 100644
index fc5716e4..00000000
--- a/client/changes/bug_unlock_shared_if_fails
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Unlock shared_db if anything fails in the bootstrap
-    sequence. Fixes #4702.
\ No newline at end of file
diff --git a/client/changes/feature_4451_avoid_concurrent_syncs b/client/changes/feature_4451_avoid_concurrent_syncs
deleted file mode 100644
index 04a2c4df..00000000
--- a/client/changes/feature_4451_avoid_concurrent_syncs
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Avoid concurrent syncs for the same account, but allow for distinct
-    accounts (4451).
diff --git a/client/changes/feature_4616_sqlite_count_by_index b/client/changes/feature_4616_sqlite_count_by_index
deleted file mode 100644
index c7819d38..00000000
--- a/client/changes/feature_4616_sqlite_count_by_index
+++ /dev/null
@@ -1 +0,0 @@
-  o Adds a get_count_by_index to sqlcipher u1db backend. Related to: #4616
diff --git a/client/changes/feature_5302_do-not-create-user-db-when-syncing b/client/changes/feature_5302_do-not-create-user-db-when-syncing
deleted file mode 100644
index c3270ab1..00000000
--- a/client/changes/feature_5302_do-not-create-user-db-when-syncing
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Do not autocreate remote user database when syncing. Tapicero should make
-    sure that that db is created when the user is created. Closes #5302.
diff --git a/client/changes/feature_rw_lock_client_ops b/client/changes/feature_rw_lock_client_ops
deleted file mode 100644
index 1c1ab446..00000000
--- a/client/changes/feature_rw_lock_client_ops
+++ /dev/null
@@ -1 +0,0 @@
-  o Add a read-write lock for all client operations. Addresses: #4972
diff --git a/client/changes/feature_sqlite-optimization-pragmas b/client/changes/feature_sqlite-optimization-pragmas
deleted file mode 100644
index 7a35f005..00000000
--- a/client/changes/feature_sqlite-optimization-pragmas
+++ /dev/null
@@ -1 +0,0 @@
-  o Add sync=off and tem_store=mem to soledad client, for optimization.
diff --git a/common/changes/bug_4435_add-lock-timeout-error b/common/changes/bug_4435_add-lock-timeout-error
deleted file mode 100644
index 8f220b1d..00000000
--- a/common/changes/bug_4435_add-lock-timeout-error
+++ /dev/null
@@ -1 +0,0 @@
-  o Add lock timeout HTTP error (#4435).
diff --git a/common/changes/bug_4475_remodel-couch-backend b/common/changes/bug_4475_remodel-couch-backend
deleted file mode 100644
index 13a1b121..00000000
--- a/common/changes/bug_4475_remodel-couch-backend
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Remodel couch backend to fix concurrency and scalability. Closes #4475,
-    #4682, #4683 and #4680.
diff --git a/common/changes/bug_5387_remove-check-for-ddocs-on-couch-server-state b/common/changes/bug_5387_remove-check-for-ddocs-on-couch-server-state
deleted file mode 100644
index 71c0cac2..00000000
--- a/common/changes/bug_5387_remove-check-for-ddocs-on-couch-server-state
+++ /dev/null
@@ -1 +0,0 @@
-  o Remove check for design docs on couch server state initialization (#5387).
diff --git a/common/changes/bug_5449_add-workaround-for-hanging-requests-after-multipart-put b/common/changes/bug_5449_add-workaround-for-hanging-requests-after-multipart-put
deleted file mode 100644
index dece564a..00000000
--- a/common/changes/bug_5449_add-workaround-for-hanging-requests-after-multipart-put
+++ /dev/null
@@ -1 +0,0 @@
-  o Renew HTTP session after multipart PUTs to avoid request hanging (#5449).
diff --git a/common/changes/bug_5449_preload-strptime-to-avoid-multi-thread-problem b/common/changes/bug_5449_preload-strptime-to-avoid-multi-thread-problem
deleted file mode 100644
index 17d1f463..00000000
--- a/common/changes/bug_5449_preload-strptime-to-avoid-multi-thread-problem
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Preload time.strptime() to avoid multi-threaded problem on couch backend
-    get_docs() method (#5449).
diff --git a/common/changes/feature_4035_improve-error-messages b/common/changes/feature_4035_improve-error-messages
deleted file mode 100644
index 4f86a17f..00000000
--- a/common/changes/feature_4035_improve-error-messages
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Improve error messages. Closes #5035.
-      * Add MissingTokenError and InvalidTokenError as sub exceptions from
-        Unauthorized.
diff --git a/common/changes/feature_4836_allow-sync-of-large-files b/common/changes/feature_4836_allow-sync-of-large-files
deleted file mode 100644
index f124e899..00000000
--- a/common/changes/feature_4836_allow-sync-of-large-files
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow sync of large files (~100MB) (#4836).
diff --git a/common/changes/feature_4994_add-missing-design-doc-exception b/common/changes/feature_4994_add-missing-design-doc-exception
deleted file mode 100644
index d5291cc1..00000000
--- a/common/changes/feature_4994_add-missing-design-doc-exception
+++ /dev/null
@@ -1 +0,0 @@
-  o Add exceptions to deal with missing design documents. Fixes #4994.
diff --git a/common/changes/feature_5008_parallelize-get_docs-on-couch-backend b/common/changes/feature_5008_parallelize-get_docs-on-couch-backend
deleted file mode 100644
index d452c888..00000000
--- a/common/changes/feature_5008_parallelize-get_docs-on-couch-backend
+++ /dev/null
@@ -1 +0,0 @@
-  o Parallelize get_docs() on couch backend to accelerate sync (#5008).
diff --git a/common/changes/feature_5011-use-less-memory-when-putting-docs-on-couch b/common/changes/feature_5011-use-less-memory-when-putting-docs-on-couch
deleted file mode 100644
index 7d3f6e4f..00000000
--- a/common/changes/feature_5011-use-less-memory-when-putting-docs-on-couch
+++ /dev/null
@@ -1 +0,0 @@
-  o Use less memory when putting docs on couch (#5011).
diff --git a/common/changes/feature_5302_prevent-couch-server-state-from-creating-or-deleting-dbs b/common/changes/feature_5302_prevent-couch-server-state-from-creating-or-deleting-dbs
deleted file mode 100644
index acd74529..00000000
--- a/common/changes/feature_5302_prevent-couch-server-state-from-creating-or-deleting-dbs
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Prevent CouchServerState from creating or deleting databases. This way,
-    Soledad remote clients won't ever be able to do these operations when
-    syncing. Part of #5302.
diff --git a/common/changes/feature_5388_avoid-concurrent-syncs-update-handler-conflict b/common/changes/feature_5388_avoid-concurrent-syncs-update-handler-conflict
deleted file mode 100644
index d0c820db..00000000
--- a/common/changes/feature_5388_avoid-concurrent-syncs-update-handler-conflict
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Avoid concurrent syncs problem by adding a lock for PUTting to the sync
-    log update handler (#5388).
diff --git a/common/changes/remove-check-for-couch-permissions b/common/changes/remove-check-for-couch-permissions
deleted file mode 100644
index f77f59f1..00000000
--- a/common/changes/remove-check-for-couch-permissions
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Remove check for couch permissions when CouchServerState is instantiated.
-    This is not necessary anymore because platform takes care of giving the
-    soledad user enough permissions and tapicero takes care of uploading the
-    needed design documents.
diff --git a/server/changes/VERSION_COMPAT b/server/changes/VERSION_COMPAT
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/server/changes/VERSION_COMPAT
diff --git a/server/changes/bug_4435_send-timeout-response b/server/changes/bug_4435_send-timeout-response
deleted file mode 100644
index ccc74959..00000000
--- a/server/changes/bug_4435_send-timeout-response
+++ /dev/null
@@ -1 +0,0 @@
-  o Send propper lock timeout response (#4435).
diff --git a/server/changes/bug_5191_fix-raise-of-auth-token-errors b/server/changes/bug_5191_fix-raise-of-auth-token-errors
deleted file mode 100644
index 4e3b08ad..00000000
--- a/server/changes/bug_5191_fix-raise-of-auth-token-errors
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix raising of auth token errors (#5191).
diff --git a/server/changes/feature_4836_allow-sync-of-large-files b/server/changes/feature_4836_allow-sync-of-large-files
deleted file mode 100644
index f124e899..00000000
--- a/server/changes/feature_4836_allow-sync-of-large-files
+++ /dev/null
@@ -1 +0,0 @@
-  o Allow sync of large files (~100MB) (#4836).
diff --git a/server/changes/feature_4918_use-temporary-directory-for-server-side-locks b/server/changes/feature_4918_use-temporary-directory-for-server-side-locks
deleted file mode 100644
index d8c5ba8e..00000000
--- a/server/changes/feature_4918_use-temporary-directory-for-server-side-locks
+++ /dev/null
@@ -1 +0,0 @@
-  o Use a temporary directory for server side locks (#4918).
diff --git a/server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs b/server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs
deleted file mode 100644
index f37a8c18..00000000
--- a/server/changes/feature_4994-catch-resource-not-found-when-accessing-design-docs
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Catch couchdb.http.ResourceNotFound exceptions when accessing design
-    documents on couch backend, and raise appropriate missing design documents
-    exceptions. Fixes #4994.
diff --git a/server/changes/feature_5302_do-not-ensure-shared-database b/server/changes/feature_5302_do-not-ensure-shared-database
deleted file mode 100644
index 4ee70b9a..00000000
--- a/server/changes/feature_5302_do-not-ensure-shared-database
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Do not try to create the shared database when running the Soledad Server
-    application (#5302).
diff --git a/server/changes/feature_enable-gzip b/server/changes/feature_enable-gzip
deleted file mode 100644
index 5cc1597c..00000000
--- a/server/changes/feature_enable-gzip
+++ /dev/null
@@ -1 +0,0 @@
-  o Enable Gzip compression on the soledad wsgi app.