summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.rst10
-rw-r--r--synapse/__init__.py2
2 files changed, 11 insertions, 1 deletions
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"