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](#8648), [\#8656](#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](#8654))
matrix-org · Oct 26, 2020 · cf9a17a · cf9a17a
2 parents ff7f0e8 + 191f2e5
commit cf9a17a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git 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
diff --git a/changelog.d/8654.bugfix b/changelog.d/8654.bugfix
diff --git a/changelog.d/8656.bugfix b/changelog.d/8656.bugfix
diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -48,7 +48,7 @@
 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