summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-04-09 14:39:05 -0300
committerdrebs <drebs@leap.se>2015-04-09 14:39:05 -0300
commitbbb19ed9a755a079da5b79567cb98a921c02f2f4 (patch)
tree3149d5547b015baf0ca37ecd9421829feff5f45c
parent1edacb035f0fc65ca26f8b1324b5cff6fdabf7bf (diff)
Fold in changes.0.6.5release/0.6.x
-rw-r--r--CHANGELOG9
-rw-r--r--common/changes/bug_6671-bail-out-if-no-cdocs-dir1
-rw-r--r--common/changes/bug_6833_remove-unneeded-params-from-couch-server-state2
-rw-r--r--server/changes/bug_6833_remove-unneeded-params-from-couch-server-state2
4 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index e3ada799..4e3f2038 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.6.5 Apr 09 2015:
+Server:
+ o Remove unneeded parameters from CouchServerState initialization. Closes
+ #6833.
+
+0.6.4 Jan 23 2015:
+Common:
+ o Bail out if cdocs/ dir does not exist. Closes: #6671
+
0.6.3 Dec 16 2014:
Client:
o Fix deferred encryption/decryption parameters (#6500).
diff --git a/common/changes/bug_6671-bail-out-if-no-cdocs-dir b/common/changes/bug_6671-bail-out-if-no-cdocs-dir
deleted file mode 100644
index e57e50e5..00000000
--- a/common/changes/bug_6671-bail-out-if-no-cdocs-dir
+++ /dev/null
@@ -1 +0,0 @@
-o Bail out if cdocs/ dir does not exist. Closes: #6671
diff --git a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717..00000000
--- a/common/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
- o Remove unneeded parameters from CouchServerState initialization. Closes
- #6833.
diff --git a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state b/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
deleted file mode 100644
index 2c927717..00000000
--- a/server/changes/bug_6833_remove-unneeded-params-from-couch-server-state
+++ /dev/null
@@ -1,2 +0,0 @@
- o Remove unneeded parameters from CouchServerState initialization. Closes
- #6833.