summary refs log tree commit diff
diff options
context:
space:
mode:
authorH. Shay <hillerys@element.io>2023-01-12 12:40:09 -0800
committerH. Shay <hillerys@element.io>2023-01-12 12:40:09 -0800
commit12083d37a80a0e75965e6039326878e1fdd79d2d (patch)
tree98e8e0902c33d1ec2788cc496b6ae7c703b1e9c9
parentMerge remote-tracking branch 'origin/release-v1.75' into develop (diff)
parent1.75.0rc2 (diff)
downloadsynapse-12083d37a80a0e75965e6039326878e1fdd79d2d.tar.xz
Merge branch 'release-v1.75' into develop
-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 10d50ddb45..d5427bdbb6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,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"