summary refs log tree commit diff
path: root/CHANGES.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-19 11:40:32 +0000
committerErik Johnston <erik@matrix.org>2018-03-19 11:41:01 +0000
commitfa728034900ae63d8132962008319d37df3993db (patch)
tree9ed8d7230c116bc28057f11395a795d3f993880c /CHANGES.rst
parentspell out not to massively increase bcrypt rounds (diff)
parentMerge branch 'hotfixes-v0.26.1' of github.com:matrix-org/synapse (diff)
downloadsynapse-fa728034900ae63d8132962008319d37df3993db.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'CHANGES.rst')
-rw-r--r--CHANGES.rst11
1 files changed, 5 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index a7ed49e105..3b32928238 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,11 +1,10 @@
-Unreleased
-==========
+Changes in synapse v0.26.1 (2018-03-15)
+=======================================
 
-synctl no longer starts the main synapse when using ``-a`` option with workers.
-A new worker file should be added with ``worker_app: synapse.app.homeserver``.
+Bug fixes:
 
-This release also begins the process of renaming a number of the metrics
-reported to prometheus. See `docs/metrics-howto.rst <docs/metrics-howto.rst#block-and-response-metrics-renamed-for-0-27-0>`_.
+* 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)