From b95dbdcba4fd79d9a5e3c53075af4838f5816bd2 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 17 Oct 2016 15:59:12 +0100
Subject: [PATCH] Bump version and changelog

---
 CHANGES.rst         | 26 +++++++++++++++++++++++++-
 synapse/__init__.py |  2 +-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 12abd6cfc4..c5b38b5ca4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,4 +1,28 @@
-Changes in synapse v0.18.1 (2016-10-0)
+Changes in synapse v0.18.2-rc1 (2016-10-17)
+===========================================
+
+Changes:
+
+* Remove redundant event_auth index (PR #1113)
+* Reduce DB hits for replication (PR #1141)
+* Implement pluggable password auth (PR #1155)
+* Remove rate limiting from app service senders and fix get_or_create_user
+  requester (PR #1157)
+* window.postmessage for Interactive Auth fallback (PR #1159)
+* Use sys.executable instead of hardcoded python. fixes #1161 (PR #1162)
+* Add config option for adding additional TLS fingerprints (PR #1167)
+* User-interactive auth on delete device (PR #1168)
+
+
+Bug fixes:
+
+* Fix not being allowed to set your own state_key (PR #1150)
+* Fix interactive auth to return 401 from for incorrect password (PR #1160)
+* Fix email push notifs being dropped (PR #1169)
+
+
+
+Changes in synapse v0.18.1 (2016-10-05)
 ======================================
 
 No changes since v0.18.1-rc1
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6dbe8fc7e7..6333c1119e 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.1"
+__version__ = "0.18.2-rc1"