From ca0fbf276f7374c9b2d5acfee277f65877bebc05 Mon Sep 17 00:00:00 2001
From: Ivan Alejandro <ivanalejandro0@gmail.com>
Date: Mon, 5 Oct 2015 12:33:59 -0300
Subject: [pkg] fold in changes

---
 CHANGELOG.rst                                   | 14 ++++++++++++++
 changes/bug-7451_missing-attribute              |  1 -
 changes/bug-7503_handle-soledad-init-fail       |  1 -
 changes/bug-logbook_handler_bubble              |  1 -
 changes/feature-7471_disable-email-fw-on-docker |  1 -
 5 files changed, 14 insertions(+), 4 deletions(-)
 delete mode 100644 changes/bug-7451_missing-attribute
 delete mode 100644 changes/bug-7503_handle-soledad-init-fail
 delete mode 100644 changes/bug-logbook_handler_bubble
 delete mode 100644 changes/feature-7471_disable-email-fw-on-docker

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2114c5ab..421389e2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,20 @@
 Changelog
 ---------
 
+0.9.0rc4 October 05
++++++++++++++++++++
+
+Features
+~~~~~~~~
+- `#7471 <https://leap.se/code/issues/7471>`_: Disable email firewall if we are running inside a docker container.
+
+Bugfixes
+~~~~~~~~
+- `#7451 <https://leap.se/code/issues/7451>`_: Assign the timeout 'call later' before starting the sync to prevent race conditions.
+- `#7503 <https://leap.se/code/issues/7503>`_: Handle soledad init fail after several retries.
+- Remove bubble argument from the logbook NullHandler
+
+
 0.9.0rc3 September 22
 +++++++++++++++++++++
 
diff --git a/changes/bug-7451_missing-attribute b/changes/bug-7451_missing-attribute
deleted file mode 100644
index 502210c6..00000000
--- a/changes/bug-7451_missing-attribute
+++ /dev/null
@@ -1 +0,0 @@
-- Assign the timeout 'call later' before starting the sync to prevent race conditions. Related to #7451.
diff --git a/changes/bug-7503_handle-soledad-init-fail b/changes/bug-7503_handle-soledad-init-fail
deleted file mode 100644
index 2edc751e..00000000
--- a/changes/bug-7503_handle-soledad-init-fail
+++ /dev/null
@@ -1 +0,0 @@
-- Handle soledad init fail after several retries. Closes bug #7503.
diff --git a/changes/bug-logbook_handler_bubble b/changes/bug-logbook_handler_bubble
deleted file mode 100644
index 3770e84f..00000000
--- a/changes/bug-logbook_handler_bubble
+++ /dev/null
@@ -1 +0,0 @@
-- Remove bubble argument from the logbook NullHandler
diff --git a/changes/feature-7471_disable-email-fw-on-docker b/changes/feature-7471_disable-email-fw-on-docker
deleted file mode 100644
index 0a31d564..00000000
--- a/changes/feature-7471_disable-email-fw-on-docker
+++ /dev/null
@@ -1 +0,0 @@
-- disable email firewall if we are running inside a docker container. Related to #7471.
-- 
cgit v1.2.3