summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keymanager/CHANGELOG.rst10
-rw-r--r--keymanager/changes/async_gpg1
-rw-r--r--keymanager/changes/bug-serializable-keys1
-rw-r--r--keymanager/changes/next-changelog.txt2
4 files changed, 11 insertions, 3 deletions
diff --git a/keymanager/CHANGELOG.rst b/keymanager/CHANGELOG.rst
index f1cd9e13..3716025e 100644
--- a/keymanager/CHANGELOG.rst
+++ b/keymanager/CHANGELOG.rst
@@ -1,3 +1,11 @@
+0.5.1 - 04 Apr, 2016
+++++++++++++++++++++
+
+Features
+~~~~~~~~
+- Create an iterator on EncryptionKey to be able to represent it as a dict
+
+
0.5.0 - 18 Apr, 2016
++++++++++++++++++++
@@ -8,6 +16,8 @@ Features
- `#7500 <https://leap.se/code/issues/7500>`_: Use fingerprints instead of key ids.
- `#7712 <https://leap.se/code/issues/7712>`_: Document the soledad docs fields.
- Make EncryptionKey aware of the active address.
+- Defer encrypt, decrypt and gen_key operations from gnupg to external threads,
+ limited by cpu core amount.
Bugfixes
~~~~~~~~
diff --git a/keymanager/changes/async_gpg b/keymanager/changes/async_gpg
deleted file mode 100644
index 59d4d417..00000000
--- a/keymanager/changes/async_gpg
+++ /dev/null
@@ -1 +0,0 @@
--- Defer encrypt, decrypt and gen_key operations from gnupg to external threads, limited by cpu core amount.
diff --git a/keymanager/changes/bug-serializable-keys b/keymanager/changes/bug-serializable-keys
deleted file mode 100644
index 0885fd28..00000000
--- a/keymanager/changes/bug-serializable-keys
+++ /dev/null
@@ -1 +0,0 @@
-- encryption keys can now be serialized to json using key.get_dict()
diff --git a/keymanager/changes/next-changelog.txt b/keymanager/changes/next-changelog.txt
index c59c85a6..09b2e71f 100644
--- a/keymanager/changes/next-changelog.txt
+++ b/keymanager/changes/next-changelog.txt
@@ -1,4 +1,4 @@
-0.5.1 - xxx
+0.5.2 - xxx
+++++++++++++++++++++++++++++++
Please add lines to this file, they will be moved to the CHANGELOG.rst during