From 2c5c7f58b796fc9f71c4279a2d3f5fa062ef2533 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Tue, 27 Oct 2015 18:46:29 -0300
Subject: [PATCH] [pkg] fold in changes

---
 CHANGELOG                                           | 9 +++++++++
 client/changes/bug_7503-do-not-signal-sync-complete | 1 -
 client/changes/bug_missing_design_doc_handler       | 1 -
 3 files changed, 9 insertions(+), 2 deletions(-)
 delete mode 100644 client/changes/bug_7503-do-not-signal-sync-complete
 delete mode 100644 client/changes/bug_missing_design_doc_handler

diff --git a/CHANGELOG b/CHANGELOG
index f35f7830..b0530226 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.7.4 Oct 28, 2015:
+Client:
+  o Do not signal sync completion if sync failed. Closes: #7503
+  o Handle missing design doc at GET (get_sync_info). Soledad server can handle
+    this during sync.
+  o Increase http request timeout time to 90s. Related: #7382.
+  o Handle DatabaseDoesNotExist during sync.
+  o Handle MissingDesignDocError after get_sync_info.
+
 0.7.3 Sep 22, 2015:
 Client:
   o Bugfix: refactor code loss. Closes #7412.
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.
-- 
GitLab