From 2c1bc4392fd29c70cc174d3e396847385c82c9fa Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 20 Nov 2015 16:35:01 +0000 Subject: [PATCH 1/4] Bump changes and version --- CHANGES.rst | 15 +++++++++++++++ synapse/__init__.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) 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" From 7680ae16c9380b65cc6d6dfe192fa2775ce5a5d3 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 20 Nov 2015 16:40:55 +0000 Subject: [PATCH 2/4] Fix english --- CHANGES.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index 4ffffacab0..5c38c1915f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -3,8 +3,8 @@ 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) + could take several 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) From 13130c2c9f9e9ff8f58f8d6bc226c14deec6df0f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 20 Nov 2015 16:48:43 +0000 Subject: [PATCH 3/4] Mention report_stats in upgrade.rst --- UPGRADE.rst | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/UPGRADE.rst b/UPGRADE.rst index 35a0333a7e..4f08cbb96a 100644 --- a/UPGRADE.rst +++ b/UPGRADE.rst @@ -30,6 +30,19 @@ running: python synapse/python_dependencies.py | xargs -n1 pip install +Upgrading to v0.11.0 +==================== + +This release includes the option to send anonymous usage stats to matrix.org, +and requires that administrators explictly opt in or out by setting the +``report_stats`` option to either ``true`` or ``false``. + +We would really appreciate it if you could help our project out by reporting +anonymized usage statistics from your homeserver. Only very basic aggregate +data (e.g. number of users) will be reported, but it helps us to track the +growth of the Matrix community, and helps us to make Matrix a success, as well +as to convince other networks that they should peer with us. + Upgrading to v0.9.0 =================== From 4013216fccc4cd3dbdf58b04169caab5fb6531a7 Mon Sep 17 00:00:00 2001 From: Oleg Girko Date: Sun, 6 Dec 2015 20:47:41 +0000 Subject: [PATCH 4/4] Fix mock import in tests. For some reason, one test imports Mock class from mock.mock rather than from mock. This change fixes this error. Signed-off-by: Oleg Girko --- tests/storage/test_events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/storage/test_events.py b/tests/storage/test_events.py index 313013009e..946cd3e9f2 100644 --- a/tests/storage/test_events.py +++ b/tests/storage/test_events.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. import uuid -from mock.mock import Mock +from mock import Mock from synapse.types import RoomID, UserID from tests import unittest