summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2023-01-12 10:30:54 -0800
committerH. Shay <hillerys@element.io>2023-01-12 10:30:54 -0800
commitea452571998c64a0d49d11791b58053bfbd9834b (patch)
treee7bc2d88a1e80ea8757ecfc6817f235d2843530e
parentFix race calling `/members?at=` (#14817) (diff)
downloadsynapse-ea452571998c64a0d49d11791b58053bfbd9834b.tar.xz
1.75.0rc2 v1.75.0rc2
-rw-r--r--CHANGES.md10
-rw-r--r--changelog.d/14810.bugfix1
-rw-r--r--changelog.d/14817.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
5 files changed, 17 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 261ce6a864..951a2273b5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,13 @@
+Synapse 1.75.0rc2 (2023-01-12)
+==============================
+
+Bugfixes
+--------
+
+- Fix a bug introduced in Synapse 1.75.0rc1 where device lists could be miscalculated with some sync filters. ([\#14810](https://github.com/matrix-org/synapse/issues/14810))
+- Fix race where calling `/members` or `/state` with an `at` parameter could fail for newly created rooms, when using multiple workers. ([\#14817](https://github.com/matrix-org/synapse/issues/14817))
+
+
 Synapse 1.75.0rc1 (2023-01-10)
 ==============================
 
diff --git a/changelog.d/14810.bugfix b/changelog.d/14810.bugfix
deleted file mode 100644
index 379bfccffa..0000000000
--- a/changelog.d/14810.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.75.0rc1 where device lists could be miscalculated with some sync filters.
diff --git a/changelog.d/14817.bugfix b/changelog.d/14817.bugfix
deleted file mode 100644
index bb5da79268..0000000000
--- a/changelog.d/14817.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix race where calling `/members` or `/state` with an `at` parameter could fail for newly created rooms, when using multiple workers.
diff --git a/debian/changelog b/debian/changelog
index e02793c996..125b678f93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.75.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.75.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 12 Jan 2023 10:30:15 -0800
+
 matrix-synapse-py3 (1.75.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.75.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 740d33066e..12f1686d21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -97,7 +97,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.75.0rc1"
+version = "1.75.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"