From 5995b8339d67effdd58f92e1b357c2f5a7e4ce0a Mon Sep 17 00:00:00 2001 From: Ivan Alejandro Date: Tue, 3 Nov 2015 12:35:48 -0300 Subject: [pkg] fold in changes --- CHANGELOG.rst | 12 ++++++++++++ changes/next-changelog.rst | 6 +----- 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 `_: Pin mail.bitmask.net provider. Closes feature #7542. + +Bugfixes +~~~~~~~~ +- `#7563 `_: try to look for /usr/bin/gpg1 +- `#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 `_: Pin mail.bitmask.net provider. Closes feature #7542. - `#1234 `_: Description of the new feature corresponding with issue #1234. - New feature without related issue number. Bugfixes ~~~~~~~~ -- `#7563 `_: try to look for /usr/bin/gpg1 -- `#7562 `_: use zmq embedded minitornado, instead of system lib. - `#1235 `_: Description for the fixed stuff corresponding with issue #1235. - Bugfix without related issue number. @@ -28,5 +25,4 @@ Misc Known Issues ~~~~~~~~~~~~ - - `#1236 `_: Description of the known issue corresponding with issue #1236. -- cgit v1.2.3