From 7a3adbd7af320e076d480071f3870b277a6f9ff8 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 26 Oct 2020 15:11:03 +0000
Subject: [PATCH] 1.22.0rc2

---
 CHANGES.md              | 11 +++++++++++
 changelog.d/8648.bugfix |  1 -
 changelog.d/8654.bugfix |  1 -
 changelog.d/8656.bugfix |  1 -
 synapse/__init__.py     |  2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/8648.bugfix
 delete mode 100644 changelog.d/8654.bugfix
 delete mode 100644 changelog.d/8656.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 6066a38c5..406d7de7e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,14 @@
+Synapse 1.22.0rc2 (2020-10-26)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in v1.22.0rc1 which would cause ephemeral events to not be sent to appservices. ([\#8648](https://github.com/matrix-org/synapse/issues/8648))
+- Fix `user_daily_visits` to not have duplicate rows for UA. Broke in v1.22.0rc1. ([\#8654](https://github.com/matrix-org/synapse/issues/8654))
+- Fix a bug introduced in v1.22.0rc1 where presence events were not properly passed to application services. ([\#8656](https://github.com/matrix-org/synapse/issues/8656))
+
+
 Synapse 1.22.0rc1 (2020-10-22)
 ==============================
 
diff --git a/changelog.d/8648.bugfix b/changelog.d/8648.bugfix
deleted file mode 100644
index aa71ad0ff..000000000
--- 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 91d3265b7..000000000
--- 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 d6415e828..000000000
--- 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 c9d53e767..24a581544 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