summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
committerMatthew Hodgson <matthew@matrix.org>2016-12-31 02:38:26 +0000
commit899a3a126857e94a16fda65cd11b5b5c4efeed01 (patch)
tree56e3527cd9e9c62a71cee6d9064d3704f0e11ef2 /CHANGES.rst
parentMerge remote-tracking branch 'origin/release-v0.18.6' into develop (diff)
parentBump version and changelog (diff)
downloadsynapse-899a3a126857e94a16fda65cd11b5b5c4efeed01.tar.xz
Merge branch 'release-v0.18.6' into develop
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst10
1 files changed, 10 insertions, 0 deletions
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)
 ===========================================