summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-06 15:52:59 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-06 15:52:59 -0300
commitdccd720c685ce5f7744a240b7d8c0ad2795390ba (patch)
tree70ffb63227d8b93224339267589a08297f3d58fb
parent256f129c50ee232dc35043dface166780e3c1553 (diff)
parent6a72835b3fa7267ffcf30ae0e5b5fa948e296390 (diff)
Merge branch 'release-0.3.2' into develop
-rw-r--r--CHANGELOG10
-rw-r--r--client/changes/feature-3574_use-dirspec-instead-of-plain-xdg1
-rw-r--r--common/changes/feature_3487-split-soledad-into-common-client-and-server1
-rw-r--r--common/changes/feature_improve_packaging1
-rw-r--r--server/changes/bug_init_script2
5 files changed, 10 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2137aebd..4d04046a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.3.2 Sep 6:
+Client:
+ o Use dirspec instead of plain xdg. Closes #3574.
+Server:
+ o Fix the init script for soledad server so that it uses the new
+ package namespace.
+Common:
+ o Split soledad package into common, client and server. Closes #3487.
+ o Add versioneer, parse_requirements
+
0.3.1 Aug 23:
Client:
o Add libsqlite3-dev requirement for soledad.
diff --git a/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg b/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg
deleted file mode 100644
index 9bdc5071..00000000
--- a/client/changes/feature-3574_use-dirspec-instead-of-plain-xdg
+++ /dev/null
@@ -1 +0,0 @@
- o Use dirspec instead of plain xdg. Closes #3574.
diff --git a/common/changes/feature_3487-split-soledad-into-common-client-and-server b/common/changes/feature_3487-split-soledad-into-common-client-and-server
deleted file mode 100644
index 2eab6b56..00000000
--- a/common/changes/feature_3487-split-soledad-into-common-client-and-server
+++ /dev/null
@@ -1 +0,0 @@
- o Split soledad package into common, client and server. Closes #3487.
diff --git a/common/changes/feature_improve_packaging b/common/changes/feature_improve_packaging
deleted file mode 100644
index e6d3630a..00000000
--- a/common/changes/feature_improve_packaging
+++ /dev/null
@@ -1 +0,0 @@
- o Add versioneer, parse_requirements
diff --git a/server/changes/bug_init_script b/server/changes/bug_init_script
deleted file mode 100644
index dc4fc322..00000000
--- a/server/changes/bug_init_script
+++ /dev/null
@@ -1,2 +0,0 @@
- o Fix the init script for soledad server so that it uses the new
- package namespace. \ No newline at end of file