1.70.0rc2

8 files changed, 25 insertions, 6 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 17e666709b..8052dbe466 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,21 @@
+Synapse 1.70.0rc2 (2022-10-25)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.70.0rc1 where the information returned from the `/threads` API could be stale when threaded events are redacted. ([\#14248](https://github.com/matrix-org/synapse/issues/14248))
+- Fix a bug introduced in Synapse 1.70.0rc1 leading to broken outbound federation when using Python 3.7. ([\#14280](https://github.com/matrix-org/synapse/issues/14280))
+- Fix a bug introduced in Synapse 1.70.0rc1 where edits to non-message events were aggregated by the homeserver. ([\#14283](https://github.com/matrix-org/synapse/issues/14283))
+
+
+Internal Changes
+----------------
+
+- Build ABI3 wheels for CPython. ([\#14253](https://github.com/matrix-org/synapse/issues/14253))
+- For the aarch64 architecture, only build wheels for CPython manylinux. ([\#14259](https://github.com/matrix-org/synapse/issues/14259))
+
+
 Synapse 1.70.0rc1 (2022-10-19)
 ==============================
 
diff --git a/changelog.d/14248.bugfix b/changelog.d/14248.bugfix
deleted file mode 100644
index 203c52c16b..0000000000
--- a/changelog.d/14248.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.70.0rc1 where the information returned from the `/threads` API could be stale when threaded events are redacted.
diff --git a/changelog.d/14253.misc b/changelog.d/14253.misc
deleted file mode 100644
index c1382ddafa..0000000000
--- a/changelog.d/14253.misc
+++ /dev/null
@@ -1 +0,0 @@
-Build ABI3 wheels for cpython.
diff --git a/changelog.d/14259.misc b/changelog.d/14259.misc
deleted file mode 100644
index 7425498964..0000000000
--- a/changelog.d/14259.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only build aarch64 wheels for cpython manylinux.
diff --git a/changelog.d/14280.bugfix b/changelog.d/14280.bugfix
deleted file mode 100644
index c546d2be48..0000000000
--- a/changelog.d/14280.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix broken outbound federation when using Python 3.7. Broke in v1.70.0rc1.
diff --git a/changelog.d/14283.bugfix b/changelog.d/14283.bugfix
deleted file mode 100644
index a80a8c0361..0000000000
--- a/changelog.d/14283.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.70.0rc1 where edits to non-message events were aggregated by the homeserver.
diff --git a/debian/changelog b/debian/changelog
index 60ec92b47d..c3139b7271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.70.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.70.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 25 Oct 2022 10:59:47 +0100
+
 matrix-synapse-py3 (1.70.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.70.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index ec0fbd1eb9..7cd4a15435 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.70.0rc1"
+version = "1.70.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"