From a01605c13681eeeeaf6abce80737db8e02f587cc Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Mon, 25 Jan 2021 08:25:40 -0500
Subject: [PATCH] 1.26.0rc2

---
 CHANGES.md              | 17 +++++++++++++++++
 changelog.d/9189.misc   |  1 -
 changelog.d/9193.bugfix |  1 -
 changelog.d/9195.bugfix |  1 -
 changelog.d/9204.misc   |  1 -
 changelog.d/9210.bugfix |  1 -
 synapse/__init__.py     |  2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)
 delete mode 100644 changelog.d/9189.misc
 delete mode 100644 changelog.d/9193.bugfix
 delete mode 100644 changelog.d/9195.bugfix
 delete mode 100644 changelog.d/9204.misc
 delete mode 100644 changelog.d/9210.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 1c64007e5..026225893 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,20 @@
+Synapse 1.26.0rc2 (2021-01-25)
+==============================
+
+Bugfixes
+--------
+
+- Fix receipts or account data not being sent down sync. Introduced in v1.26.0rc1. ([\#9193](https://github.com/matrix-org/synapse/issues/9193), [\#9195](https://github.com/matrix-org/synapse/issues/9195))
+- Fix chain cover update to handle events with duplicate auth events. Introduced in v1.26.0rc1. ([\#9210](https://github.com/matrix-org/synapse/issues/9210))
+
+
+Internal Changes
+----------------
+
+- Add an `oidc-` prefix to any `idp_id`s which are given in the `oidc_providers` configuration. ([\#9189](https://github.com/matrix-org/synapse/issues/9189))
+- Bump minimum `psycopg2` version. ([\#9204](https://github.com/matrix-org/synapse/issues/9204))
+
+
 Synapse 1.26.0rc1 (2021-01-20)
 ==============================
 
diff --git a/changelog.d/9189.misc b/changelog.d/9189.misc
deleted file mode 100644
index 9a5740aac..000000000
--- a/changelog.d/9189.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add an `oidc-` prefix to any `idp_id`s which are given in the `oidc_providers` configuration.
diff --git a/changelog.d/9193.bugfix b/changelog.d/9193.bugfix
deleted file mode 100644
index 5233ffc3e..000000000
--- a/changelog.d/9193.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix receipts or account data not being sent down sync. Introduced in v1.26.0rc1.
diff --git a/changelog.d/9195.bugfix b/changelog.d/9195.bugfix
deleted file mode 100644
index 5233ffc3e..000000000
--- a/changelog.d/9195.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix receipts or account data not being sent down sync. Introduced in v1.26.0rc1.
diff --git a/changelog.d/9204.misc b/changelog.d/9204.misc
deleted file mode 100644
index fac79a902..000000000
--- a/changelog.d/9204.misc
+++ /dev/null
@@ -1 +0,0 @@
-Bump minimum `psycopg2` version.
diff --git a/changelog.d/9210.bugfix b/changelog.d/9210.bugfix
deleted file mode 100644
index f9e076557..000000000
--- a/changelog.d/9210.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix chain cover update to handle events with duplicate auth events. Introduced in v1.26.0rc1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d423856d8..3cd682f9e 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.26.0rc1"
+__version__ = "1.26.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