summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-02-13 13:24:29 +0000
committerErik Johnston <erik@matrix.org>2024-02-13 13:24:29 +0000
commitbc1db16086d0718c9c0bb61b32b825ba62049bb0 (patch)
treeda3df68bdd31b0f9699129d5f510fea474338464
parentDon't invalidate the entire event cache when we purge history (#16905) (diff)
parent1.101.0 (diff)
downloadsynapse-bc1db16086d0718c9c0bb61b32b825ba62049bb0.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/16893.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
4 files changed, 16 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index e48e97eeff..9fedd57971 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+# Synapse 1.101.0 (2024-02-13)
+
+### Bugfixes
+
+- Fix performance regression when fetching auth chains from the DB. Introduced in v1.100.0. ([\#16893](https://github.com/element-hq/synapse/issues/16893))
+
+
+
+
 # Synapse 1.101.0rc1 (2024-02-06)
 
 ### Improved Documentation
diff --git a/changelog.d/16893.bugfix b/changelog.d/16893.bugfix
deleted file mode 100644
index 7222cd765c..0000000000
--- a/changelog.d/16893.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix performance regression when fetching auth chains from the DB. Introduced in v1.100.0.
diff --git a/debian/changelog b/debian/changelog
index 48604eb1d0..33a658b66c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.101.0) stable; urgency=medium
+
+  * New Synapse release 1.101.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 13 Feb 2024 10:45:35 +0000
+
 matrix-synapse-py3 (1.101.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.101.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 4bd4439694..cd8bb39422 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -96,7 +96,7 @@ module-name = "synapse.synapse_rust"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.101.0rc1"
+version = "1.101.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "AGPL-3.0-or-later"