summary refs log tree commit diff
diff options
context:
space:
mode:
authorMathieu Velten <mathieuv@matrix.org>2023-06-14 12:16:41 +0200
committerMathieu Velten <mathieuv@matrix.org>2023-06-14 12:17:29 +0200
commit825c5909de642c9c6494ef464684e29630d197b5 (patch)
treeb95f37280713ec69b7f9e0e94ed97a7b01c8f5f3
parentRevert "Allow for the configuration of max request retries and min/max retry ... (diff)
downloadsynapse-825c5909de642c9c6494ef464684e29630d197b5.tar.xz
1.86.0rc2 v1.86.0rc2
-rw-r--r--CHANGES.md11
-rw-r--r--changelog.d/15774.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
4 files changed, 18 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index d898593664..f2f39c3b6e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,17 @@
+Synapse 1.86.0rc2 (2023-06-14)
+==============================
+
+Bugfixes
+--------
+
+- Fix an error when having workers of different versions running. ([\#15774](https://github.com/matrix-org/synapse/issues/15774))
+
+
 Synapse 1.86.0rc1 (2023-06-13)
 ==============================
 
+This version was tagged but never released.
+
 Features
 --------
 
diff --git a/changelog.d/15774.bugfix b/changelog.d/15774.bugfix
deleted file mode 100644
index c24d6c25e4..0000000000
--- a/changelog.d/15774.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an error when having workers of different versions running.
diff --git a/debian/changelog b/debian/changelog
index 1c13433c47..81b71ba342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.86.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.86.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Wed, 14 Jun 2023 12:16:27 +0200
+
 matrix-synapse-py3 (1.86.0~rc1) stable; urgency=medium
 
   * New Synapse release 1.86.0rc1.
diff --git a/pyproject.toml b/pyproject.toml
index 6bbbf95001..097bd03943 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -89,7 +89,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.86.0rc1"
+version = "1.86.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"