summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-12-30 20:21:04 +0000
committerMark Haines <mark.haines@matrix.org>2016-12-30 20:21:04 +0000
commitf3de4f8cb7383a71bbbdd4c3c45dd803ee45e415 (patch)
treecad6f7e6e58442b012b294fa803f18275e3c043a
parentMerge pull request #1736 from matrix-org/markjh/linearizer_logging (diff)
downloadsynapse-f3de4f8cb7383a71bbbdd4c3c45dd803ee45e415.tar.xz
Bump version and changelog v0.18.6-rc2
-rw-r--r--CHANGES.rst10
-rw-r--r--synapse/__init__.py2
2 files changed, 11 insertions, 1 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)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 84592f53ea..fbb2bb57b0 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.6-rc1"
+__version__ = "0.18.6-rc2"