From f3de4f8cb7383a71bbbdd4c3c45dd803ee45e415 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Fri, 30 Dec 2016 20:21:04 +0000
Subject: Bump version and changelog

---
 CHANGES.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'CHANGES.rst')

diff --git a/CHANGES.rst b/CHANGES.rst
index 108f827cf2..dfa5d8748a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,13 @@
+Changes in synapse v0.18.6-rc2 (2016-12-30)
+===========================================
+
+Bug fixes:
+
+* Fix memory leak in twisted by initialising logging correctly (PR #1731)
+* Fix bug where fetching missing events took an unacceptable amount of time in
+  large rooms (PR #1734)
+
+
 Changes in synapse v0.18.6-rc1 (2016-12-29)
 ===========================================
 
-- 
cgit 1.4.1