diff options
author | Erik Johnston <erik@matrix.org> | 2020-10-26 15:23:13 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-10-26 15:23:13 +0000 |
commit | cf9a17a2b372d332ede3feddddda0847a347756e (patch) | |
tree | bdba7899144f07e2af7d8453fe284cfbcd3605fc | |
parent | Merge branch 'release-v1.22.0' into develop (diff) | |
parent | Fixup changelog (diff) | |
download | synapse-cf9a17a2b372d332ede3feddddda0847a347756e.tar.xz |
Merge tag 'v1.22.0rc2' into develop
Synapse 1.22.0rc2 (2020-10-26) ============================== Bugfixes -------- - Fix bugs where ephemeral events were not sent to appservices. Broke in v1.22.0rc1. ([\#8648](https://github.com/matrix-org/synapse/issues/8648), [\#8656](https://github.com/matrix-org/synapse/issues/8656)) - Fix `user_daily_visits` table to not have duplicate rows per user/device due to multiple user agents. Broke in v1.22.0rc1. ([\#8654](https://github.com/matrix-org/synapse/issues/8654))
-rw-r--r-- | CHANGES.md | 9 | ||||
-rw-r--r-- | changelog.d/8648.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/8654.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/8656.bugfix | 1 | ||||
-rw-r--r-- | synapse/__init__.py | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md index 6066a38c5a..54a642e11a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Synapse 1.22.0rc2 (2020-10-26) +============================== + +Bugfixes +-------- + +- Fix bugs where ephemeral events were not sent to appservices. Broke in v1.22.0rc1. ([\#8648](https://github.com/matrix-org/synapse/issues/8648), [\#8656](https://github.com/matrix-org/synapse/issues/8656)) +- Fix `user_daily_visits` table to not have duplicate rows per user/device due to multiple user agents. Broke in v1.22.0rc1. ([\#8654](https://github.com/matrix-org/synapse/issues/8654)) + Synapse 1.22.0rc1 (2020-10-22) ============================== diff --git a/changelog.d/8648.bugfix b/changelog.d/8648.bugfix deleted file mode 100644 index aa71ad0ff2..0000000000 --- a/changelog.d/8648.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug introduced in v1.22.0rc1 which would cause ephemeral events to not be sent to appservices. \ No newline at end of file diff --git a/changelog.d/8654.bugfix b/changelog.d/8654.bugfix deleted file mode 100644 index 91d3265b7f..0000000000 --- a/changelog.d/8654.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix `user_daily_visits` to not have duplicate rows for UA. Broke in v1.22.0rc1. diff --git a/changelog.d/8656.bugfix b/changelog.d/8656.bugfix deleted file mode 100644 index d6415e8282..0000000000 --- a/changelog.d/8656.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fix a bug introduced in v1.22.0rc1 where presence events were not properly passed to application services. diff --git a/synapse/__init__.py b/synapse/__init__.py index c9d53e767a..24a5815447 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.22.0rc1" +__version__ = "1.22.0rc2" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when |