From edcf93817399b409b832f54b8caac0af277eba96 Mon Sep 17 00:00:00 2001
From: David Robertson <davidr@element.io>
Date: Mon, 13 Mar 2023 12:57:56 +0000
Subject: [PATCH] 1.79.0rc2

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

diff --git a/CHANGES.md b/CHANGES.md
index 2357be33f..43259f323 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,19 @@
+Synapse 1.79.0rc2 (2023-03-13)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.79.0rc1 where attempting to register a `on_remove_user_third_party_identifier` module API callback would be a no-op. ([\#15227](https://github.com/matrix-org/synapse/issues/15227))
+- Fix a rare bug introduced in Synapse 1.73 where events could remain unsent to other homeservers after a faster-join to a room. ([\#15248](https://github.com/matrix-org/synapse/issues/15248))
+
+
+Internal Changes
+----------------
+
+- Refactor `filter_events_for_server`. ([\#15240](https://github.com/matrix-org/synapse/issues/15240))
+
+
 Synapse 1.79.0rc1 (2023-03-07)
 ==============================
 
diff --git a/changelog.d/15227.bugfix b/changelog.d/15227.bugfix
deleted file mode 100644
index eaa26c8f7..000000000
--- a/changelog.d/15227.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.79.0rc1 where attempting to register a `on_remove_user_third_party_identifier` module API callback would be a no-op.
\ No newline at end of file
diff --git a/changelog.d/15240.misc b/changelog.d/15240.misc
deleted file mode 100644
index 2b7edf916..000000000
--- a/changelog.d/15240.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `filter_events_for_server`.
diff --git a/changelog.d/15248.bugfix b/changelog.d/15248.bugfix
deleted file mode 100644
index 8665acb49..000000000
--- a/changelog.d/15248.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a rare bug introduced in Synapse 1.73 where events could remain unsent to other homeservers after a faster-join to a room.
diff --git a/debian/changelog b/debian/changelog
index 871c695f0..a91521f6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.79.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.79.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 13 Mar 2023 12:54:21 +0000
+
 matrix-synapse-py3 (1.79.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.79.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 90a118741..dbdc3c499 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.79.0rc1"
+version = "1.79.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"