Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop

2 files changed, 20 insertions, 1 deletions

diff --git a/CHANGES.rst b/CHANGES.rst

index 1f97680f41..4291ccc7aa 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,22 @@
+Changes in synapse v0.18.2-rc2 (2016-10-25)
+===========================================
+
+Changes:
+
+* Clarify error codes for GET /filter/, thanks to Alexander Maznev (PR #1164)
+* Make password reset email field case insensitive (PR #1170)
+* Reduce redundant database work in email pusher (PR #1174)
+* Allow configurable rate limiting per AS (PR #1175)
+* Check whether to ratelimit sooner to avoid work (PR #1176)
+* Standardise prometheus metrics (PR #1177)
+
+
+Bug fixes:
+
+* Fix incredibly slow back pagination query (PR #1178)
+* Fix infinite typing bug (PR #1179)
+
+
 Changes in synapse v0.18.2-rc1 (2016-10-17)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py

index 6333c1119e..fdffbfe815 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.18.2-rc1"
+__version__ = "0.18.2-rc2"