summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-07 01:11:56 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-07 01:11:56 +0000
commit2f5be2d8dcdb03c14178d0f7dd19583d377457d6 (patch)
tree2502a3138c2e3639d81bfe19f4ff6d7b7139a06b
parentmove logging to right place (diff)
downloadsynapse-2f5be2d8dcdb03c14178d0f7dd19583d377457d6.tar.xz
oops, this should have been rc1
-rw-r--r--CHANGES.rst5
-rw-r--r--synapse/__init__.py2
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 59b7f83a30..3db747df38 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,9 +1,10 @@
-Changes in synapse v0.18.7 (2017-01-06)
-=======================================
+Changes in synapse v0.18.7-rc1 (2017-01-06)
+===========================================
 
 Bug fixes:
 
 * Fix error in #PR 1764 to actually fix the nightmare #1753 bug.
+* Improve deadlock logging further
 
 Changes in synapse v0.18.6 (2017-01-06)
 =======================================
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 498ded38c0..91e3a2c2e0 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.7"
+__version__ = "0.18.7-rc1"