1.69.0rc4 v1.69.0rc4

6 files changed, 23 insertions, 5 deletions

diff --git a/CHANGES.md b/CHANGES.md
index c695586cf1..b3b22b6d14 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Synapse 1.69.0rc3 (2022-10-12)
+Synapse 1.69.0rc4 (2022-10-14)
 ==============================
 
 Please note that legacy Prometheus metric names are now deprecated and will be removed in Synapse 1.73.0.
@@ -9,6 +9,21 @@ See the [upgrade notes](https://matrix-org.github.io/synapse/v1.69/upgrade.html#
 Bugfixes
 --------
 
+- Fix poor performance of the `event_push_backfill_thread_id` background update, which was introduced in Synapse 1.68.0rc1. ([\#14172](https://github.com/matrix-org/synapse/issues/14172), [\#14181](https://github.com/matrix-org/synapse/issues/14181))
+
+
+Updates to the Docker image
+---------------------------
+
+- Fix docker build OOMing in CI for arm64 builds. ([\#14173](https://github.com/matrix-org/synapse/issues/14173))
+
+
+Synapse 1.69.0rc3 (2022-10-12)
+==============================
+
+Bugfixes
+--------
+
 - Fix an issue with Docker images causing the Rust dependencies to not be pinned correctly. Introduced in v1.68.0 ([\#14129](https://github.com/matrix-org/synapse/issues/14129))
 - Fix a bug introduced in Synapse 1.69.0rc1 which would cause registration replication requests to fail if the worker sending the request is not running Synapse 1.69. ([\#14135](https://github.com/matrix-org/synapse/issues/14135))
 - Fix error in background update when rotating existing notifications. Introduced in v1.69.0rc2. ([\#14138](https://github.com/matrix-org/synapse/issues/14138))
diff --git a/changelog.d/14172.bugfix b/changelog.d/14172.bugfix
deleted file mode 100644
index 36521c670c..0000000000
--- a/changelog.d/14172.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix poor performance of the `event_push_backfill_thread_id` background update, which was introduced in Synapse 1.68.0rc1.
diff --git a/changelog.d/14173.docker b/changelog.d/14173.docker
deleted file mode 100644
index 5ad113f435..0000000000
--- a/changelog.d/14173.docker
+++ /dev/null
@@ -1 +0,0 @@
-Fix docker build OOMing in CI for arm64 builds.
diff --git a/changelog.d/14181.bugfix b/changelog.d/14181.bugfix
deleted file mode 100644
index 36521c670c..0000000000
--- a/changelog.d/14181.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix poor performance of the `event_push_backfill_thread_id` background update, which was introduced in Synapse 1.68.0rc1.
diff --git a/debian/changelog b/debian/changelog
index e2c3a64f40..1a84b8cd51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.69.0~rc4) stable; urgency=medium
+
+  * New Synapse release 1.69.0rc4.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 14 Oct 2022 15:04:47 +0100
+
 matrix-synapse-py3 (1.69.0~rc3) stable; urgency=medium
 
   * New Synapse release 1.69.0rc3.
diff --git a/pyproject.toml b/pyproject.toml
index 0b1eab634e..61f876ee59 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.69.0rc3"
+version = "1.69.0rc4"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"