Merge tag '0.8.0' into develop

Tag soledad version 0.8.0

14 files changed, 86 insertions, 24 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 00000000..ed60b5ec
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,55 @@
+0.8.0 - 18 Apr, 2016
+++++++++++++++++++++
+
+Client
+======
+
+Features
+~~~~~~~~
+- `#7656 <https://leap.se/code/issues/7656>`_: Emit multi-user aware events.
+- Client will now send documents at a limited size batch due to changes on SyncTarget. The default limit is 500kB. Disabled by default.
+
+Bugfixes
+~~~~~~~~
+- `#7503 <https://leap.se/code/issues/7503>`_: Do not signal sync completion if sync failed.
+- Handle missing design doc at GET (get_sync_info). Soledad server can handle this during sync.
+
+Misc
+~~~~
+- `#7195 <https://leap.se/code/issues/7195>`_: Use cryptography instead of pycryptopp.
+
+Known Issues
+~~~~~~~~~~~~
+- Upload phase of client syncs is still quite slow. Enabling size limited batching
+  can help, but you have to make sure that your server is compatible.
+
+Server
+======
+
+Features
+~~~~~~~~
+- General performance improvements.
+- `#7509 <https://leap.se/code/issues/7509>`_: Moves config directory from /etc/leap to /etc/soledad.
+- Adds a new config parameter 'create_cmd', which allows sysadmin to specify
+  which command will create a database. That command was added in
+  pkg/create-user-db and debian package automates steps needed for sudo access.
+- Read netrc path from configuration file for create-user-db command. 
+- 'create-user-db' script now can be configured from soledad-server.conf when
+  generating the user's security document.
+- Migrating a user's database to newest design documents is now possible by
+  using a parameter '--migrate-all' on 'create-user-db' script.
+- Remove tsafe monkeypatch from SSL lib, as it was needed for Twisted <12
+- Added two methods to start and finish a batch on backend. They can be used to
+  change database behaviour, allowing batch operations to be optimized.
+
+Common
+======
+
+Features
+~~~~~~~~
+- Add a sanitized command executor for database creation and re-enable user
+  database creation on CouchServerState via command line.
+
+Bugfixes
+~~~~~~~~
+- `#7626 <https://leap.se/code/issues/7626>`_: Subclass a leaky leap.common.couch exception to avoid depending on couch.
diff --git a/CHANGELOG b/HISTORY
index b0530226..b0530226 100644
--- a/CHANGELOG
+++ b/HISTORY
diff --git a/client/changes/bug_7503-do-not-signal-sync-complete b/client/changes/bug_7503-do-not-signal-sync-complete
deleted file mode 100644
index 4cc361e0..00000000
--- a/client/changes/bug_7503-do-not-signal-sync-complete
+++ /dev/null
@@ -1 +0,0 @@
-o Do not signal sync completion if sync failed. Closes: #7503
diff --git a/client/changes/bug_missing_design_doc_handler b/client/changes/bug_missing_design_doc_handler
deleted file mode 100644
index 72e42b85..00000000
--- a/client/changes/bug_missing_design_doc_handler
+++ /dev/null
@@ -1 +0,0 @@
-o Handle missing design doc at GET (get_sync_info). Soledad server can handle this during sync.
diff --git a/client/changes/feat_send_batch b/client/changes/feat_send_batch
deleted file mode 100644
index fbfce519..00000000
--- a/client/changes/feat_send_batch
+++ /dev/null
@@ -1 +0,0 @@
-o Client will now send documents at a limited size batch due to changes on SyncTarget. The default limit is 500kB.
diff --git a/client/changes/feat_use_cryptography b/client/changes/feat_use_cryptography
deleted file mode 100644
index 6e8fe3bf..00000000
--- a/client/changes/feat_use_cryptography
+++ /dev/null
@@ -1 +0,0 @@
-o Use cryptography instead of pycryptopp. Stick with AES-CTR.
diff --git a/client/changes/next-changelog.rst b/client/changes/next-changelog.rst
index 89234cb2..bdc9f893 100644
--- a/client/changes/next-changelog.rst
+++ b/client/changes/next-changelog.rst
@@ -1,5 +1,5 @@
-0.8.0 - xxx
-+++++++++++++++++++++++++++++++
+0.8.1 - ...
+++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during
 the next release.
@@ -10,7 +10,6 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
 
 Features
 ~~~~~~~~
-- `#7656 <https://leap.se/code/issues/7656>`_: Emit multi-user aware events.
 - `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
 - New feature without related issue number.
 
@@ -21,7 +20,6 @@ Bugfixes
 
 Misc
 ~~~~
-- `#7195 <https://leap.se/code/issues/7195>`_: Use cryptography instead of pycryptopp.
 - `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
 - Some change without issue number.
 
diff --git a/common/changes/create_db_cmd b/common/changes/create_db_cmd
deleted file mode 100644
index 00bbdf71..00000000
--- a/common/changes/create_db_cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add a sanitized command executor for database creation and re-enable
-  user database creation on CouchServerState via command line.
diff --git a/common/changes/next-changelog.rst b/common/changes/next-changelog.rst
index e05f80ce..c0974384 100644
--- a/common/changes/next-changelog.rst
+++ b/common/changes/next-changelog.rst
@@ -1,4 +1,4 @@
-0.8.0 - xxx
+0.8.0 - ...
 +++++++++++++++++++++++++++++++
 
 Please add lines to this file, they will be moved to the CHANGELOG.rst during
@@ -15,7 +15,6 @@ Features
 
 Bugfixes
 ~~~~~~~~
-- `#7626 <https://leap.se/code/issues/7626>`_: Subclass a leaky leap.common.couch exception to avoid depending on couch.
 - `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
 - Bugfix without related issue number.
 
diff --git a/server/changes/change_soledad_configdir b/server/changes/change_soledad_configdir
deleted file mode 100644
index 710b9ac8..00000000
--- a/server/changes/change_soledad_configdir
+++ /dev/null
@@ -1,2 +0,0 @@
-o Moves config directory from /etc/leap to /etc/soledad
-  resolves #7509
diff --git a/server/changes/create_db_cmd b/server/changes/create_db_cmd
deleted file mode 100644
index 964a7906..00000000
--- a/server/changes/create_db_cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Adds a new config parameter 'create_cmd', which allows sysadmin to specify
-  which command will create a database. That command was added in
-  pkg/create-user-db and debian package automates steps needed for sudo access.
-  o Read netrc path from configuration file for create-user-db command. 
diff --git a/server/changes/feat_configurable_ensure b/server/changes/feat_configurable_ensure
deleted file mode 100644
index 8abd2ac9..00000000
--- a/server/changes/feat_configurable_ensure
+++ /dev/null
@@ -1,5 +0,0 @@
-o 'create-user-db' script now can be configured from soledad-server.conf
-  when generating the user's security document.
-o Migrating a user's database to newest design documents is now possible by
-  using a parameter '--migrate-all' on 'create-user-db' script.
-o Remove tsafe monkeypatch from SSL lib, as it was needed for Twisted <12
diff --git a/server/changes/feat_handle_send_batch_better b/server/changes/feat_handle_send_batch_better
deleted file mode 100644
index 6ee8688a..00000000
--- a/server/changes/feat_handle_send_batch_better
+++ /dev/null
@@ -1 +0,0 @@
-o Added two methods to start and finish a batch on backend. They can be used to change database behaviour, allowing batch operations to be optimized.
diff --git a/server/changes/next-changelog.rst b/server/changes/next-changelog.rst
new file mode 100644
index 00000000..bdc9f893
--- /dev/null
+++ b/server/changes/next-changelog.rst
@@ -0,0 +1,28 @@
+0.8.1 - ...
+++++++++++++++++++++
+
+Please add lines to this file, they will be moved to the CHANGELOG.rst during
+the next release.
+
+There are two template lines for each category, use them as reference.
+
+I've added a new category `Misc` so we can track doc/style/packaging stuff.
+
+Features
+~~~~~~~~
+- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
+- New feature without related issue number.
+
+Bugfixes
+~~~~~~~~
+- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
+- Bugfix without related issue number.
+
+Misc
+~~~~
+- `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
+- Some change without issue number.
+
+Known Issues
+~~~~~~~~~~~~
+- `#1236 <https://leap.se/code/issues/1236>`_: Description of the known issue corresponding with issue #1236.