From bbb19ed9a755a079da5b79567cb98a921c02f2f4 Mon Sep 17 00:00:00 2001 From: drebs Date: Thu, 9 Apr 2015 14:39:05 -0300 Subject: Fold in changes. --- CHANGELOG | 9 +++++++++ common/changes/bug_6671-bail-out-if-no-cdocs-dir | 1 - .../bug_6833_remove-unneeded-params-from-couch-server-state | 2 -- .../bug_6833_remove-unneeded-params-from-couch-server-state | 2 -- 4 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 common/changes/bug_6671-bail-out-if-no-cdocs-dir delete mode 100644 common/changes/bug_6833_remove-unneeded-params-from-couch-server-state delete mode 100644 server/changes/bug_6833_remove-unneeded-params-from-couch-server-state 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. -- cgit v1.2.3