From 4e09d727b699c3bdf6b0288e9436f472631c01b8 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Tue, 25 Jan 2022 12:53:29 +0000 Subject: [PATCH] Use changelog from develop It had already accounted for 1.50.2 (ordered chronologically rather than sem-ver-ically); it just seems this wasn't merged into master when we released 1.50.2. --- CHANGES.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ba76b5017e..37b9e6bb96 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -14,6 +14,17 @@ Bugfixes - Fix a bug introduced in Synapse 1.40.0 that caused Synapse to fail to process incoming federation traffic after handling a large amount of events in a v1 room. ([\#11806](https://github.com/matrix-org/synapse/issues/11806)) +Synapse 1.50.2 (2022-01-24) +=========================== + +This release includes the same bugfix as Synapse 1.51.0rc2. + +Bugfixes +-------- + +- Fix a bug introduced in Synapse 1.40.0 that caused Synapse to fail to process incoming federation traffic after handling a large amount of events in a v1 room. ([\#11806](https://github.com/matrix-org/synapse/issues/11806)) + + Synapse 1.51.0rc1 (2022-01-21) ============================== @@ -89,15 +100,6 @@ Internal Changes - Add some comments and type annotations for `_update_outliers_txn`. ([\#11776](https://github.com/matrix-org/synapse/issues/11776)) -Synapse 1.50.2 (2022-01-24) -=========================== - -Bugfixes --------- - -- Backport the sole fix from v1.51.0rc2. This fixes a bug introduced in Synapse 1.40.0 that caused Synapse to fail to process incoming federation traffic after handling a large amount of events in a v1 room. ([\#11806](https://github.com/matrix-org/synapse/issues/11806)) - - Synapse 1.50.1 (2022-01-18) ===========================