summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-12-06 15:42:59 -0300
committerTomás Touceda <chiiph@leap.se>2013-12-06 15:42:59 -0300
commit5f2a29120ba2d22d7d2406628ce2f6735b60d09c (patch)
treeabb188c846482e60a1961864b70c17cbf760f6a8
parenta87d67bac35a36cca491853268d7f518d028c9c2 (diff)
Fold in changes
-rw-r--r--CHANGELOG8
-rw-r--r--client/changes/VERSION_COMPAT0
-rw-r--r--client/changes/feature_4348_add-mac-verification-to-recovery-doc2
-rw-r--r--common/changes/VERSION_COMPAT0
-rw-r--r--common/changes/bug_4095_add-unicode-conversion-to-put_doc1
-rw-r--r--common/changes/bug_4258_remove-dependency-on-nose21
6 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0713cb25..83bb883e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.4.4 Dec 6:
+Client:
+ o Add MAC verirication to the recovery document and
+ soledad.json. Closes #4348.
+Common:
+ o Add unicode conversion to put_doc(). Closes #4095.
+ o Remove tests dependency on nose2. Closes #4258.
+
0.4.3 Nov 15:
Client:
o Defaults detected encoding to utf-8 to avoid bug if detected
diff --git a/client/changes/VERSION_COMPAT b/client/changes/VERSION_COMPAT
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/client/changes/VERSION_COMPAT
diff --git a/client/changes/feature_4348_add-mac-verification-to-recovery-doc b/client/changes/feature_4348_add-mac-verification-to-recovery-doc
deleted file mode 100644
index 692403f9..00000000
--- a/client/changes/feature_4348_add-mac-verification-to-recovery-doc
+++ /dev/null
@@ -1,2 +0,0 @@
- o Add MAC verirication to the recovery document and soledad.json. Closes
- #4348.
diff --git a/common/changes/VERSION_COMPAT b/common/changes/VERSION_COMPAT
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/common/changes/VERSION_COMPAT
diff --git a/common/changes/bug_4095_add-unicode-conversion-to-put_doc b/common/changes/bug_4095_add-unicode-conversion-to-put_doc
deleted file mode 100644
index bed446ac..00000000
--- a/common/changes/bug_4095_add-unicode-conversion-to-put_doc
+++ /dev/null
@@ -1 +0,0 @@
- o Add unicode conversion to put_doc(). Closes #4095.
diff --git a/common/changes/bug_4258_remove-dependency-on-nose2 b/common/changes/bug_4258_remove-dependency-on-nose2
deleted file mode 100644
index d83fc49c..00000000
--- a/common/changes/bug_4258_remove-dependency-on-nose2
+++ /dev/null
@@ -1 +0,0 @@
- o Remove tests dependency on nose2. Closes #4258.