summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-04-18 11:06:42 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-04-18 11:06:42 -0400
commite20490628bfd714fd90a8e92f1d8c91c21f67830 (patch)
tree87a91eec0c63d07b5890be6aa6f746522c66ad86
parentfe46507c44fbfb9c8ed72799d5e8bfb0ac32a10c (diff)
parent90a1df64f6a5df09a289eeb322a77e2e984569aa (diff)
Merge tag '0.5.0' into release/0.5.x
Tag leap.bitmask version 0.5.0
-rw-r--r--CHANGELOG.rst19
-rw-r--r--HISTORY.rst (renamed from CHANGELOG)0
-rw-r--r--changes/next-changelog.txt12
3 files changed, 20 insertions, 11 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 00000000..f1cd9e13
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,19 @@
+0.5.0 - 18 Apr, 2016
+++++++++++++++++++++
+
+Features
+~~~~~~~~
+- `#7485 <https://leap.se/code/issues/7485>`_: Move validation, usage and audited date to the active document.
+- `#7713 <https://leap.se/code/issues/7713>`_: Update soledad documents by adding versioning field.
+- `#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.
+
+Bugfixes
+~~~~~~~~
+- `#7974 <https://leap.se/code/issues/7974>`_: Return KeyNotFound Failure if not valid key is given to put_raw_key.
+
+Misc
+~~~~
+- This version includes changes in the Soledad Documents and minor modifications to the API.
+- Changelog migrated to rst.
diff --git a/CHANGELOG b/HISTORY.rst
index 0a9221dc..0a9221dc 100644
--- a/CHANGELOG
+++ b/HISTORY.rst
diff --git a/changes/next-changelog.txt b/changes/next-changelog.txt
index 2dd34d4a..c59c85a6 100644
--- a/changes/next-changelog.txt
+++ b/changes/next-changelog.txt
@@ -1,4 +1,4 @@
-0.5.0 - xxx
+0.5.1 - xxx
+++++++++++++++++++++++++++++++
Please add lines to this file, they will be moved to the CHANGELOG.rst during
@@ -10,26 +10,16 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
Features
~~~~~~~~
-- `#7485 <https://leap.se/code/issues/7485>`_: Move validation, usage and audited date to the active document.
-- `#7713 <https://leap.se/code/issues/7713>`_: Update soledad documents by adding versioning field.
-- `#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.
-
- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
- New feature without related issue number.
Bugfixes
~~~~~~~~
-- `#7974 <https://leap.se/code/issues/7974>`_: Return KeyNotFound Failure if not valid key is given to put_raw_key.
-
- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
- Bugfix without related issue number.
Misc
~~~~
-- This version includes changes in the Soledad Documents and minor modifications to the API.
-
- `#1236 <https://leap.se/code/issues/1236>`_: Description of the new feature corresponding with issue #1236.
- Some change without issue number.