From 4be6f05d91891122e83f74d21c83c5f8fcd3a618 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 21 Sep 2015 19:06:51 -0300
Subject: [PATCH] [pkg] fold in changes

---
 CHANGELOG                                   | 16 ++++++++++++++++
 client/changes/bug-7412_sync-status-broken  |  1 -
 client/changes/bug_set-active-secret        |  1 -
 client/changes/refactor_improve_http_target |  3 ---
 common/changes/refactor_couch               |  2 --
 server/changes/bug_badrequest               |  1 -
 6 files changed, 16 insertions(+), 8 deletions(-)
 delete mode 100644 client/changes/bug-7412_sync-status-broken
 delete mode 100644 client/changes/bug_set-active-secret
 delete mode 100644 client/changes/refactor_improve_http_target
 delete mode 100644 common/changes/refactor_couch
 delete mode 100644 server/changes/bug_badrequest

diff --git a/CHANGELOG b/CHANGELOG
index 877a97d1..f35f7830 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+0.7.3 Sep 22, 2015:
+Client:
+  o Bugfix: refactor code loss. Closes #7412.
+  o Bugfix: Set active secret before saving local file.
+  o Split http_target into 4 modules, separating those responsibilities.
+  o Refactor details of making an HTTP request body and headers out of the
+    send/fetch logic. This also makes it easier to enable batching.
+
+Server:
+  o Fix a bug where BadRequest could be raised after everything was persisted.
+
+Common:
+  o Refactor couch.py to separate persistence from logic while saving uploaded
+    documents. Also simplify logic while checking for conflicts.
+
+
 0.7.2 Aug 26, 2015:
 Client:
   o Remove MAC from secrets file. Closes #6980.
diff --git a/client/changes/bug-7412_sync-status-broken b/client/changes/bug-7412_sync-status-broken
deleted file mode 100644
index b6800bc5..00000000
--- a/client/changes/bug-7412_sync-status-broken
+++ /dev/null
@@ -1 +0,0 @@
-o Fix refactor code loss. Closes #7412.
diff --git a/client/changes/bug_set-active-secret b/client/changes/bug_set-active-secret
deleted file mode 100644
index 8c234b25..00000000
--- a/client/changes/bug_set-active-secret
+++ /dev/null
@@ -1 +0,0 @@
-o [bug] Set active secret before saving local file.
diff --git a/client/changes/refactor_improve_http_target b/client/changes/refactor_improve_http_target
deleted file mode 100644
index a8fe5f60..00000000
--- a/client/changes/refactor_improve_http_target
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Split http_target into 4 modules, separating those responsibilities.
-  o Refactor details of making an HTTP request body and headers out of the
-  send/fetch logic. This also makes it easier to enable batching.
diff --git a/common/changes/refactor_couch b/common/changes/refactor_couch
deleted file mode 100644
index 2f36b97f..00000000
--- a/common/changes/refactor_couch
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Refactor couch.py to separate persistence from logic while saving uploaded
-  documents. Also simplify logic while checking for conflicts.
diff --git a/server/changes/bug_badrequest b/server/changes/bug_badrequest
deleted file mode 100644
index 74901476..00000000
--- a/server/changes/bug_badrequest
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix a bug where BadRequest could be raised after everything was persisted
-- 
GitLab