7 files changed, 29 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 6bafdd3fad..8f883cfc43 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,25 @@
+Synapse 1.71.0rc2 (2022-11-04)
+==============================
+
+Improved Documentation
+----------------------
+
+- Replace references to legacy metrics `synapse_admin_mau` with new metric names. ([\#14358](https://github.com/matrix-org/synapse/issues/14358))
+- Include monthly active user metrics in the list of legacy metrics names. ([\#14360](https://github.com/matrix-org/synapse/issues/14360))
+
+
+Deprecations and Removals
+-------------------------
+
+- Disable legacy Prometheus metric names by default. They can still be re-enabled for now, but they will be removed altogether in Synapse 1.73.0. ([\#14353](https://github.com/matrix-org/synapse/issues/14353))
+
+
+Internal Changes
+----------------
+
+- Run unit tests against Python 3.11. ([\#13812](https://github.com/matrix-org/synapse/issues/13812))
+
+
Synapse (Next) (2022-11-01)
=========================
diff --git a/changelog.d/13812.misc b/changelog.d/13812.misc
deleted file mode 100644
index 667fdee2b7..0000000000
--- a/changelog.d/13812.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run unit tests against Python 3.11.
diff --git a/changelog.d/14353.removal b/changelog.d/14353.removal
deleted file mode 100644
index fc42aa9106..0000000000
--- a/changelog.d/14353.removal
+++ /dev/null
@@ -1 +0,0 @@
-Disable legacy Prometheus metric names by default. They can still be re-enabled for now, but they will be removed altogether in Synapse 1.73.0.
\ No newline at end of file
diff --git a/changelog.d/14358.doc b/changelog.d/14358.doc
deleted file mode 100644
index a9b910878d..0000000000
--- a/changelog.d/14358.doc
+++ /dev/null
@@ -1 +0,0 @@
-Replace references to legacy metrics `synapse_admin_mau` with new metric names.
diff --git a/changelog.d/14360.doc b/changelog.d/14360.doc
deleted file mode 100644
index 8a8dee3b8d..0000000000
--- a/changelog.d/14360.doc
+++ /dev/null
@@ -1 +0,0 @@
-Include monthly active user metrics in the list of legacy metrics names.
diff --git a/debian/changelog b/debian/changelog
index e07fa06b7a..419fc7ebc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.71.0~rc2) stable; urgency=medium
+
+ * New Synapse release 1.71.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org> Fri, 04 Nov 2022 12:00:33 +0000
+
matrix-synapse-py3 (1.71.0~rc1) stable; urgency=medium
* New Synapse release 1.71.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 5d96328067..249b1cbedf 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
[tool.poetry]
name = "matrix-synapse"
-version = "1.71.0rc1"
+version = "1.71.0rc2"
description = "Homeserver for the Matrix decentralised comms protocol"
authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
license = "Apache-2.0"
|
