summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorNeil Johnson <neil@fragile.org.uk>2018-03-20 14:25:31 +0000
committerNeil Johnson <neil@fragile.org.uk>2018-03-20 14:25:31 +0000
commite66fbcbb02d98a0d165f3c5d4642d26add233562 (patch)
tree01b5c79c3951f31d5826a852f49aa312d8e47604 /CHANGES.rst
parentUpdate __init__.py (diff)
parentMerge pull request #3005 from matrix-org/erikj/fix_cache_size (diff)
downloadsynapse-e66fbcbb02d98a0d165f3c5d4642d26add233562.tar.xz
fix merge conflicts
Diffstat (limited to '')
-rw-r--r--CHANGES.rst12
1 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 55358287a0..788150bcfc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,7 +3,8 @@ Changes in synapse v0.27.0-rc2 (2018-03-19)
 Bugs:
 
 * Fix bug introduced in v0.27.0-rc1 that causes much increased memory usage in state cache (PR #3005)
-
+* Fix bug where an invalid event caused server to stop functioning correctly,
+  due to parsing and serializing bugs in ujson library. (pulled in from 0.26.1)
 
 Changes in synapse v0.27.0-rc1 (2018-03-14)
 ===========================================
@@ -54,6 +55,15 @@ Bug fixes:
 * Fix slow event search, switch back from GIST to GIN indexes (PR #2769, #2848)
 
 
+Changes in synapse v0.26.1 (2018-03-15)
+=======================================
+
+Bug fixes:
+
+* Fix bug where an invalid event caused server to stop functioning correctly,
+  due to parsing and serializing bugs in ujson library.
+
+
 
 Changes in synapse v0.26.0 (2018-01-05)
 =======================================