summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-07-10 15:23:15 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-07-10 16:05:43 -0300
commit918c16241b86aef45e803d92e468947ea29bed27 (patch)
tree64ba88db8dc3c8284248bdbe55543a8be76413a3
parent00db8a715be4ab7048a2f4ea2e6cfe80ec6c444a (diff)
[pkg] fold in changes
-rw-r--r--CHANGELOG5
-rw-r--r--client/changes/bug_fix-sync-enc-close-queue-error1
-rw-r--r--client/changes/feature_6996-post-sync-hooks1
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 3c05d330..a6d1558e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+0.7.1 Jul 10, 2015:
+Client:
+ o Fix sync encrypter pool close queue error. Closes #7088.
+ o Expose post-sync hooks via plugin system. Related: #6996.
+
0.7.0 Jun 01 2015:
Client:
o Do not depend on pysqlite2 (#2945).
diff --git a/client/changes/bug_fix-sync-enc-close-queue-error b/client/changes/bug_fix-sync-enc-close-queue-error
deleted file mode 100644
index 71af7c67..00000000
--- a/client/changes/bug_fix-sync-enc-close-queue-error
+++ /dev/null
@@ -1 +0,0 @@
- o Fix sync encrypter pool close queue error. Closes #7088.
diff --git a/client/changes/feature_6996-post-sync-hooks b/client/changes/feature_6996-post-sync-hooks
deleted file mode 100644
index 027c0b2a..00000000
--- a/client/changes/feature_6996-post-sync-hooks
+++ /dev/null
@@ -1 +0,0 @@
-o Expose post-sync hooks via plugin system. Related: #6996