summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2016-04-18 11:33:12 -0400
committerKali Kaneko <kali@leap.se>2016-04-18 11:33:12 -0400
commita30d51acfce6eb0e6f6c530fad461d463abaa855 (patch)
treebf5bdeb244fe4569336ee48b32cb4db0d727c373 /server
parentb5fd4060831b82f1e4ea26d6ef3792793be76d77 (diff)
parentd5974f61df6ca640dde69903976d4721b6d88007 (diff)
Merge tag '0.8.0' into develop
Tag soledad version 0.8.0
Diffstat (limited to 'server')
-rw-r--r--server/changes/change_soledad_configdir2
-rw-r--r--server/changes/create_db_cmd4
-rw-r--r--server/changes/feat_configurable_ensure5
-rw-r--r--server/changes/feat_handle_send_batch_better1
-rw-r--r--server/changes/next-changelog.rst28
5 files changed, 28 insertions, 12 deletions
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.