From bab916bccc57734fb96f7f9be66b1b15b2ed4dbf Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 8 Jun 2016 11:05:45 +0100
Subject: [PATCH] Bump version and changelog to v0.16.0-rc2

---
 CHANGES.rst         | 27 +++++++++++++++++++++++++++
 synapse/__init__.py |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index e77b31b58..40f7ebd73 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,30 @@
+Changes in synapse v0.16.0-rc2 (2016-06-08)
+===========================================
+
+Features:
+
+* Add configuration option for tuning GC via ``gc.set_threshold`` (PR #849)
+
+Changes:
+
+* Record metrics about GC (PR #771, #847, #852)
+* Add metric counter for number of persisted events (PR #841)
+
+Bug fixes:
+
+* Fix 'From' header in email notifications (PR #843)
+* Fix presence where timeouts were not being fired for the first 8h after
+  restarts (PR #842)
+* Fix bug where synapse sent malformed transactions to AS's when retrying
+  transactions (Commits 310197b, 843790)
+
+Performance Improvements:
+
+* Remove event fetching from DB threads (PR #835)
+* Change the way we cache events (PR #836)
+* Add events to cache when we persist them (PR #840)
+
+
 Changes in synapse v0.16.0-rc1 (2016-06-03)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 3b290db79..ad088a788 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.16.0-rc1"
+__version__ = "0.16.0-rc2"