summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-07 02:23:37 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-07 02:23:37 +0000
commit8c48971b510e441e2e90adb6ea84cb1e600a70c2 (patch)
treed10bf2a3da70948a17896bf43558840d27461930 /CHANGES.rst
parentMerge branch 'release-v0.18.6' into develop (diff)
parentDiscard PDUs from invalid origins due to #1753 in 0.18.[56] (diff)
downloadsynapse-8c48971b510e441e2e90adb6ea84cb1e600a70c2.tar.xz
Merge branch 'release-v0.18.7' into develop
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 28be0bb974..3db747df38 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+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)
 =======================================