summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2015-11-03 12:35:48 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2015-11-03 12:35:48 -0300
commit5995b8339d67effdd58f92e1b357c2f5a7e4ce0a (patch)
treec00dc92efb8b91ed36d04023e49483dc682ebecb
parent5d4835203875197959810d013d2d411d72db2cd1 (diff)
[pkg] fold in changes
-rw-r--r--CHANGELOG.rst12
-rw-r--r--changes/next-changelog.rst6
2 files changed, 13 insertions, 5 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2d56cc6d..9af1ebcc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,18 @@
Changelog
---------
+0.9.1 November 03 - "the day of the calaca"
++++++++++++++++++++++++++++++++++++++++++++
+
+Features
+~~~~~~~~
+- `#7542 <https://leap.se/code/issues/7542>`_: Pin mail.bitmask.net provider. Closes feature #7542.
+
+Bugfixes
+~~~~~~~~
+- `#7563 <https://leap.se/code/issues/7563>`_: try to look for /usr/bin/gpg1
+- `#7562 <https://leap.se/code/issues/7562>`_: use zmq embedded minitornado, instead of system lib.
+
0.9.0 October 28
++++++++++++++++
diff --git a/changes/next-changelog.rst b/changes/next-changelog.rst
index 73e13ae5..90448d57 100644
--- a/changes/next-changelog.rst
+++ b/changes/next-changelog.rst
@@ -1,4 +1,4 @@
-0.9.1 - xxx
+0.9.2 - xxx
+++++++++++++++++++++++++++++++
Please add lines to this file, they will be moved to the CHANGELOG.rst during
@@ -10,14 +10,11 @@ I've added a new category `Misc` so we can track doc/style/packaging stuff.
Features
~~~~~~~~
-- `#7542 <https://leap.se/code/issues/7542>`_: Pin mail.bitmask.net provider. Closes feature #7542.
- `#1234 <https://leap.se/code/issues/1234>`_: Description of the new feature corresponding with issue #1234.
- New feature without related issue number.
Bugfixes
~~~~~~~~
-- `#7563 <https://leap.se/code/issues/7563>`_: try to look for /usr/bin/gpg1
-- `#7562 <https://leap.se/code/issues/7562>`_: use zmq embedded minitornado, instead of system lib.
- `#1235 <https://leap.se/code/issues/1235>`_: Description for the fixed stuff corresponding with issue #1235.
- Bugfix without related issue number.
@@ -28,5 +25,4 @@ Misc
Known Issues
~~~~~~~~~~~~
-
- `#1236 <https://leap.se/code/issues/1236>`_: Description of the known issue corresponding with issue #1236.