From e9958d908da9b0d29d7e93538c12692519ebcfd6 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Mon, 6 Sep 2021 15:25:23 +0100
Subject: [PATCH]  1.42.0rc2

---
 CHANGES.md                | 15 +++++++++++++++
 changelog.d/10747.feature |  1 -
 changelog.d/10768.misc    |  1 -
 debian/changelog          |  6 ++++++
 synapse/__init__.py       |  2 +-
 5 files changed, 22 insertions(+), 3 deletions(-)
 delete mode 100644 changelog.d/10747.feature
 delete mode 100644 changelog.d/10768.misc

diff --git a/CHANGES.md b/CHANGES.md
index 986efbba0d..3ef521f225 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,18 @@
+Synapse 1.42.0rc2 (2021-09-06)
+==============================
+
+Features
+--------
+
+- Support room version 9 from [MSC3375](https://github.com/matrix-org/matrix-doc/pull/3375). ([\#10747](https://github.com/matrix-org/synapse/issues/10747))
+
+
+Internal Changes
+----------------
+
+- Print a warning when using one of the deprecated `template_dir` settings. ([\#10768](https://github.com/matrix-org/synapse/issues/10768))
+
+
 Synapse 1.42.0rc1 (2021-09-01)
 ==============================
 
diff --git a/changelog.d/10747.feature b/changelog.d/10747.feature
deleted file mode 100644
index c1cca9a17b..0000000000
--- a/changelog.d/10747.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support room version 9 from [MSC3375](https://github.com/matrix-org/matrix-doc/pull/3375).
diff --git a/changelog.d/10768.misc b/changelog.d/10768.misc
deleted file mode 100644
index afd64ca1b0..0000000000
--- a/changelog.d/10768.misc
+++ /dev/null
@@ -1 +0,0 @@
-Print a warning when using one of the deprecated `template_dir` settings.
diff --git a/debian/changelog b/debian/changelog
index 0f7dbdf71e..e865e0d2f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.42.0~rc2) stable; urgency=medium
+
+  * New synapse release 1.42.0~rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 06 Sep 2021 15:25:13 +0100
+
 matrix-synapse-py3 (1.42.0~rc1) stable; urgency=medium
 
   * New synapse release 1.42.0rc1.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e5b075c53b..e4302d81a8 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.42.0rc1"
+__version__ = "1.42.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