summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-09-04 15:04:27 +0100
committerDavid Robertson <davidr@element.io>2023-09-04 15:04:27 +0100
commit721346631ef9f8f74a994461cea9db131ade81f2 (patch)
tree74a192b274736e3d91dda1369d1861517b8eefe6
parentDon't reset retry timers on "valid" error codes (#16221) (diff)
parent1.91.1 (diff)
downloadsynapse-721346631ef9f8f74a994461cea9db131ade81f2.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md7
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
3 files changed, 14 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index a17734cfe3..7bd9d31619 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+# Synapse 1.91.1 (2023-09-04)
+
+### Bugfixes
+
+- Fix a performance regression introduced in Synapse 1.91.0 where event persistence would cause an excessive linear growth in CPU usage. ([\#16220](https://github.com/matrix-org/synapse/issues/16220))
+
+
 # Synapse 1.91.0 (2023-08-30)
 
 No significant changes since 1.91.0rc1.
diff --git a/debian/changelog b/debian/changelog
index 9c0f77e16a..f737041567 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.91.1) stable; urgency=medium
+
+  * New Synapse release 1.91.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 04 Sep 2023 14:03:18 +0100
+
 matrix-synapse-py3 (1.91.0) stable; urgency=medium
 
   * New Synapse release 1.91.0.
diff --git a/pyproject.toml b/pyproject.toml
index c1f95e9458..4585584723 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.91.0"
+version = "1.91.1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"