Bump version and changelog

1 files changed, 19 insertions, 0 deletions

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

index 1f97680f41..174fea9987 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)
 ===========================================