From 553e9882bf8e00a59ce7cb505c7eca730f769305 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 5 Feb 2025 16:35:55 +0000
Subject: [PATCH] 1.124.0rc2

---
 CHANGES.md               | 9 +++++++++
 changelog.d/18137.bugfix | 1 -
 debian/changelog         | 6 ++++++
 pyproject.toml           | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)
 delete mode 100644 changelog.d/18137.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 051ab130b21..3c92bedda3d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# Synapse 1.124.0rc2 (2025-02-05)
+
+### Bugfixes
+
+- Fix regression where persisting events in some rooms could fail after a previous unclean shutdown. Introduced in v1.124.0rc1. ([\#18137](https://github.com/element-hq/synapse/issues/18137))
+
+
+
+
 # Synapse 1.124.0rc1 (2025-02-04)
 
 ### Bugfixes
diff --git a/changelog.d/18137.bugfix b/changelog.d/18137.bugfix
deleted file mode 100644
index d7b9d0426fd..00000000000
--- a/changelog.d/18137.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix regression where persisting events in some rooms could fail after a previous unclean shutdown. Introduced in v1.124.0rc1.
diff --git a/debian/changelog b/debian/changelog
index 0b6d50daaac..8c84eecb20d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.124.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.124.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 05 Feb 2025 16:35:53 +0000
+
 matrix-synapse-py3 (1.124.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.124.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 8febdc4c23a..3f577a19732 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.124.0rc1"
+version = "1.124.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"