From 855645c71955ba16458e888efeda9e26a30be73a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 25 Oct 2016 11:16:16 +0100
Subject: [PATCH] Bump version and changelog

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

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)
 ===========================================
 
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"