From 571ac105e6bf9c0de328bb22b095b97fbd09e5ae Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 24 Aug 2015 17:10:45 +0100
Subject: [PATCH] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 287b04c3fe..f4946c6df3 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+Changes in synapse v0.10.0-rc2 (2015-08-24)
+===========================================
+
+* Fix bug where we incorrectly populated the ``event_forward_extremities``
+  table, resulting in problems joining large remote rooms (e.g.
+  ``#matrix:matrix.org``)
+* Reduce the number of times we wake up pushers by not listening for presence
+  or typing events, reducing the CPU cost of each pusher.
+
+
 Changes in synapse v0.10.0-rc1 (2015-08-21)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 5853165a21..b4eab89d4e 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.10.0-rc1"
+__version__ = "0.10.0-rc2"