diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-24 14:22:39 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2022-01-24 14:22:39 +0000 |
commit | ec2271ac50761164f00b5f4c3ddb0f536e308b90 (patch) | |
tree | c559b2961943f1be16e6e9cd814be4820b90698e | |
parent | Support rendering previews with data: URLs in them (#11767) (diff) | |
parent | 1.50.2 (diff) | |
download | synapse-ec2271ac50761164f00b5f4c3ddb0f536e308b90.tar.xz |
Merge branch 'master' into develop
-rw-r--r-- | CHANGES.md | 11 | ||||
-rw-r--r-- | debian/changelog | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index ce3d657c98..c4bdaf25bc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,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) ============================== diff --git a/debian/changelog b/debian/changelog index a07bf4f2ef..41053e875a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,11 @@ matrix-synapse-py3 (1.51.0~rc2) stable; urgency=medium -- Synapse Packaging team <packages@matrix.org> Mon, 24 Jan 2022 12:25:00 +0000 -matrix-synapse-py3 (1.51.0~rc1) stable; urgency=medium +matrix-synapse-py3 (1.50.2) stable; urgency=medium - * New synapse release 1.51.0~rc1. + * New synapse release 1.50.2. - -- Synapse Packaging team <packages@matrix.org> Fri, 21 Jan 2022 10:46:02 +0000 + -- Synapse Packaging team <packages@matrix.org> Mon, 24 Jan 2022 13:37:11 +0000 matrix-synapse-py3 (1.50.1) stable; urgency=medium |