From fd27f48a35736d8ba186c423a7de15ffee5143dd Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Thu, 27 Aug 2015 16:28:33 -0300
Subject: [pkg] fold in changes

---
 CHANGELOG.rst                                 | 23 +++++++++++++++++++++++
 changes/bug-6594_handle-disabled-registration |  1 -
 changes/bug-7273_logbook-subscriber-start     |  2 --
 changes/bug-7281_support-no-locations-for-eip |  1 -
 changes/bug-7343_fix_the_tests                |  1 -
 changes/feature-7291_move_tuf                 |  1 -
 changes/feature-7342_apply_updates            |  1 -
 changes/feature-7353_add-soledad-sync-info    |  1 -
 changes/feature-7356-disable-eip-on-build     |  1 -
 9 files changed, 23 insertions(+), 9 deletions(-)
 delete mode 100644 changes/bug-6594_handle-disabled-registration
 delete mode 100644 changes/bug-7273_logbook-subscriber-start
 delete mode 100644 changes/bug-7281_support-no-locations-for-eip
 delete mode 100644 changes/bug-7343_fix_the_tests
 delete mode 100644 changes/feature-7291_move_tuf
 delete mode 100644 changes/feature-7342_apply_updates
 delete mode 100644 changes/feature-7353_add-soledad-sync-info
 delete mode 100644 changes/feature-7356-disable-eip-on-build

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 5db85fb6..952574dc 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,29 @@
 Changelog
 ---------
 
+0.9.0rc2 August 27
+++++++++++++++++++
+
+Features
+~~~~~~~~
+- `#7250 <https://leap.se/code/issues/7250>`_: Enable '--danger' for stable versions.
+- `#7291 <https://leap.se/code/issues/7291>`_: Move the updater code from the launcher to the client.
+- `#7342 <https://leap.se/code/issues/7342>`_: Added apply_updates.py script for the pyinstaller bundle.
+- `#7353 <https://leap.se/code/issues/7353>`_: Add notifications of soledad sync progress to UI.
+- `#7356 <https://leap.se/code/issues/7356>`_: Allow to disable EIP component on build.
+
+Bugfixes
+~~~~~~~~
+- `#6594 <https://leap.se/code/issues/6594>`_: Handle disabled registration on provider.
+- `#7149 <https://leap.se/code/issues/7149>`_: Start the events server when reactor is running.
+- `#7273 <https://leap.se/code/issues/7273>`_: Logbook subscriber stop fails if not started.
+- `#7273 <https://leap.se/code/issues/7273>`_: ZMQError: address already in use - logbook subscriber already started.
+- `#7281 <https://leap.se/code/issues/7281>`_: Support a provider not providing location for the eip gateways.
+- `#7319 <https://leap.se/code/issues/7319>`_: Raise the maxfiles limit in OSX
+- `#7343 <https://leap.se/code/issues/7343>`_: Clean up and fix the tests.
+
+
+
 0.9.0rc1 July 10
 ++++++++++++++++
 
diff --git a/changes/bug-6594_handle-disabled-registration b/changes/bug-6594_handle-disabled-registration
deleted file mode 100644
index 91e84286..00000000
--- a/changes/bug-6594_handle-disabled-registration
+++ /dev/null
@@ -1 +0,0 @@
-- Handle disabled registration on provider. Closes Bug #6594.
diff --git a/changes/bug-7273_logbook-subscriber-start b/changes/bug-7273_logbook-subscriber-start
deleted file mode 100644
index 976d2f35..00000000
--- a/changes/bug-7273_logbook-subscriber-start
+++ /dev/null
@@ -1,2 +0,0 @@
-- Closes bug #7273 - ZMQError: address already in use - logbook subscriber already started.
-- Closes bug - logbook subscriber stop fails if not started.
diff --git a/changes/bug-7281_support-no-locations-for-eip b/changes/bug-7281_support-no-locations-for-eip
deleted file mode 100644
index 9f4e748c..00000000
--- a/changes/bug-7281_support-no-locations-for-eip
+++ /dev/null
@@ -1 +0,0 @@
-- Closes bug #7281. Support a provider not providing location for the eip gateways.
diff --git a/changes/bug-7343_fix_the_tests b/changes/bug-7343_fix_the_tests
deleted file mode 100644
index 93dac4e2..00000000
--- a/changes/bug-7343_fix_the_tests
+++ /dev/null
@@ -1 +0,0 @@
-- Clean up and fix the tests (Closes: #7343)
diff --git a/changes/feature-7291_move_tuf b/changes/feature-7291_move_tuf
deleted file mode 100644
index 3db1fd2b..00000000
--- a/changes/feature-7291_move_tuf
+++ /dev/null
@@ -1 +0,0 @@
-- Move the updater code from the launcher to the client (Closes: #7291)
diff --git a/changes/feature-7342_apply_updates b/changes/feature-7342_apply_updates
deleted file mode 100644
index df7bd726..00000000
--- a/changes/feature-7342_apply_updates
+++ /dev/null
@@ -1 +0,0 @@
-- Added apply_updates.py script for the pyinstaller bundle (Closes: #7342)
diff --git a/changes/feature-7353_add-soledad-sync-info b/changes/feature-7353_add-soledad-sync-info
deleted file mode 100644
index 3efdd720..00000000
--- a/changes/feature-7353_add-soledad-sync-info
+++ /dev/null
@@ -1 +0,0 @@
-- Close Feature #7353, add notifications of soledad sync progress to UI.
diff --git a/changes/feature-7356-disable-eip-on-build b/changes/feature-7356-disable-eip-on-build
deleted file mode 100644
index 35787946..00000000
--- a/changes/feature-7356-disable-eip-on-build
+++ /dev/null
@@ -1 +0,0 @@
-- Allow to disable EIP component on build. Closes: #7356
-- 
cgit v1.2.3