summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-05-04 17:59:07 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-05-04 17:59:07 -0400
commit82980e76b46e0601e8b97be9171b1e15d60befd5 (patch)
treea0e5fd2a0ec145628843b0fbd7de4228f9779baa /changes
parent3b20aa2e8e869556cd0a97c1e6d3404aadfd4526 (diff)
parent2d115d9dff46e81ddb10cf31f45d7a955e5658e4 (diff)
Merge branch 'debian/experimental' into debian/platform-0.8debian/platform-0.8
Diffstat (limited to 'changes')
-rw-r--r--changes/async_gpg1
-rw-r--r--changes/bug-serializable-keys1
-rw-r--r--changes/next-changelog.txt28
3 files changed, 30 insertions, 0 deletions
diff --git a/changes/async_gpg b/changes/async_gpg
new file mode 100644
index 0000000..59d4d41
--- /dev/null
+++ b/changes/async_gpg
@@ -0,0 +1 @@
+-- Defer encrypt, decrypt and gen_key operations from gnupg to external threads, limited by cpu core amount.
diff --git a/changes/bug-serializable-keys b/changes/bug-serializable-keys
new file mode 100644
index 0000000..0885fd2
--- /dev/null
+++ b/changes/bug-serializable-keys
@@ -0,0 +1 @@
+- encryption keys can now be serialized to json using key.get_dict()
diff --git a/changes/next-changelog.txt b/changes/next-changelog.txt
new file mode 100644
index 0000000..c59c85a
--- /dev/null
+++ b/changes/next-changelog.txt
@@ -0,0 +1,28 @@
+0.5.1 - xxx
++++++++++++++++++++++++++++++++
+
+Please add lines to this file, they will be moved to the CHANGELOG.rst during
+the next release.
+
+There are two template lines for each category, use them as reference.
+
+I've added a new category `Misc` so we can track doc/style/packaging stuff.
+
+Features
+~~~~~~~~
+- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
+- New feature without related issue number.
+
+Bugfixes
+~~~~~~~~
+- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
+- Bugfix without related issue number.
+
+Misc
+~~~~
+- `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
+- Some change without issue number.
+
+Known Issues
+~~~~~~~~~~~~
+- `#1236 <https://leap.se/code/issues/1236>`_: Description of the known issue corresponding with issue #1236.