From 02c2f631aed5cc2ef4bcaea25b443b625616f816 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 4 Aug 2021 17:09:27 +0100
Subject: [PATCH]  1.40.0rc2

---
 CHANGES.md               | 16 ++++++++++++++++
 changelog.d/10516.misc   |  1 -
 changelog.d/10517.bugfix |  1 -
 changelog.d/10531.bugfix |  1 -
 debian/changelog         |  6 ++++++
 synapse/__init__.py      |  2 +-
 6 files changed, 23 insertions(+), 4 deletions(-)
 delete mode 100644 changelog.d/10516.misc
 delete mode 100644 changelog.d/10517.bugfix
 delete mode 100644 changelog.d/10531.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 7ce28c4c1..75031986d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,19 @@
+Synapse 1.40.0rc2 (2021-08-04)
+==============================
+
+Bugfixes
+--------
+
+- Fix the `PeriodicallyFlushingMemoryHandler` inhibiting application shutdown because of its background thread. ([\#10517](https://github.com/matrix-org/synapse/issues/10517))
+- Fix a bug introduced in Synapse v1.40.0rc1 that would cause Synapse to respond with an error when clients would update their read receipts. ([\#10531](https://github.com/matrix-org/synapse/issues/10531))
+
+
+Internal Changes
+----------------
+
+- Fix release script to open correct URL for the release. ([\#10516](https://github.com/matrix-org/synapse/issues/10516))
+
+
 Synapse 1.40.0rc1 (2021-08-03)
 ==============================
 
diff --git a/changelog.d/10516.misc b/changelog.d/10516.misc
deleted file mode 100644
index 4d8c5e480..000000000
--- a/changelog.d/10516.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix release script to open correct URL for the release.
diff --git a/changelog.d/10517.bugfix b/changelog.d/10517.bugfix
deleted file mode 100644
index 5b044bb34..000000000
--- a/changelog.d/10517.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix the `PeriodicallyFlushingMemoryHandler` inhibiting application shutdown because of its background thread.
diff --git a/changelog.d/10531.bugfix b/changelog.d/10531.bugfix
deleted file mode 100644
index aaa921ee9..000000000
--- a/changelog.d/10531.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse v1.40.0rc1 that would cause Synapse to respond with an error when clients would update their read receipts.
diff --git a/debian/changelog b/debian/changelog
index f0557c35e..c523101f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.40.0~rc2) stable; urgency=medium
+
+  * New synapse release 1.40.0~rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 04 Aug 2021 17:08:55 +0100
+
 matrix-synapse-py3 (1.40.0~rc1) stable; urgency=medium
 
   [ Richard van der Hoff ]
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d6c176550..da5246353 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.40.0rc1"
+__version__ = "1.40.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