summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-20 16:35:01 +0000
committerErik Johnston <erik@matrix.org>2015-11-20 16:35:01 +0000
commit2c1bc4392fd29c70cc174d3e396847385c82c9fa (patch)
treeca858a807e23e6a707d3e6ad533e8facdbcb5460
parentMerge pull request #394 from matrix-org/erikj/search (diff)
downloadsynapse-2c1bc4392fd29c70cc174d3e396847385c82c9fa.tar.xz
Bump changes and version
-rw-r--r--CHANGES.rst15
-rw-r--r--synapse/__init__.py2
2 files changed, 16 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index d01eca4004..4ffffacab0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,18 @@
+Changes in synapse v0.11.1 (2015-11-20)
+=======================================
+
+* Add extra options to search API (PR #394)
+* Fix bug where we did not correctly cap federation retry timers. This meant it
+  hours for servers to start talking to ressurected servers, even when they
+  were receiving traffic from them (PR #393)
+* Don't advertise login token flow unless CAS is enabled. This caused issues
+  where some clients would always use the fallback API if they did not
+  recognize all login flows (PR #391)
+* Change /v2 sync API to rename ``private_user_data`` to ``account_data``
+  (PR #386)
+* Change /v2 sync API to remove the ``event_map`` and rename keys in ``rooms``
+  object (PR #389)
+
 Changes in synapse v0.11.0-r2 (2015-11-19)
 ==========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 7ff37edf2c..3e7e26bf60 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.11.0-r2"
+__version__ = "0.11.1"