summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-12-29 16:18:04 +0000
committerMark Haines <mark.haines@matrix.org>2016-12-29 16:18:04 +0000
commitf023be9293d7fb8a95f55304579e15681efc5128 (patch)
treea49249cc44d0f82a4b03cfc447a9b8987197237a
parentMerge pull request #1725 from matrix-org/erikj/timeout_conn (diff)
downloadsynapse-f023be9293d7fb8a95f55304579e15681efc5128.tar.xz
Bump changelog and version v0.18.6-rc1
-rw-r--r--CHANGES.rst7
-rw-r--r--synapse/__init__.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index aafd61ab4a..108f827cf2 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes in synapse v0.18.6-rc1 (2016-12-29)
+===========================================
+
+Bug fixes:
+
+* Make sure that outbound connections are closed (PR #1725)
+
 Changes in synapse v0.18.5 (2016-12-16)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index f006e10dc5..84592f53ea 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.5"
+__version__ = "0.18.6-rc1"