summary refs log tree commit diff
diff options
context:
space:
mode:
authorSean Quah <seanq@matrix.org>2022-10-06 10:33:23 +0100
committerSean Quah <seanq@matrix.org>2022-10-06 10:33:23 +0100
commitf6f6bdc7b3bc3ccf26028c7342fbf33968bf4071 (patch)
treea2429be6cdff5f3471214bc21037dfe1c36375d3
parentFix backwards compatibility with upcoming threads schema changes. (#14045) (diff)
downloadsynapse-f6f6bdc7b3bc3ccf26028c7342fbf33968bf4071.tar.xz
1.69.0rc2
-rw-r--r--CHANGES.md12
-rw-r--r--changelog.d/14045.misc1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
4 files changed, 17 insertions, 4 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 60961bf38d..bb3ba7cff2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,12 +1,20 @@
-Synapse 1.69.0rc1 (2022-10-04)
+Synapse 1.69.0rc2 (2022-10-06)
 ==============================
 
-
 Please note that legacy Prometheus metric names are now deprecated and will be removed in Synapse 1.73.0.
 Server administrators should update their dashboards and alerting rules to avoid using the deprecated metric names.
 See the [upgrade notes](https://matrix-org.github.io/synapse/v1.69/upgrade.html#upgrading-to-v1690) for more details.
 
 
+Internal Changes
+----------------
+
+- Ensure Synapse v1.69 works with upcoming database changes in v1.70. ([\#14045](https://github.com/matrix-org/synapse/issues/14045))
+
+
+Synapse 1.69.0rc1 (2022-10-04)
+==============================
+
 Features
 --------
 
diff --git a/changelog.d/14045.misc b/changelog.d/14045.misc
deleted file mode 100644
index 0b0dd8f47a..0000000000
--- a/changelog.d/14045.misc
+++ /dev/null
@@ -1 +0,0 @@
-Ensure Synapse v1.69 works with upcoming database changes in v1.70.
diff --git a/debian/changelog b/debian/changelog
index 0f4dd28081..5323843b87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.69.0~rc2) stable; urgency=medium
+
+  * New Synapse release 1.69.0rc2.
+
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 06 Oct 2022 10:32:46 +0100
+
 matrix-synapse-py3 (1.69.0~rc1) stable; urgency=medium
 
   * The man page for the hash_password script has been updated to reflect
diff --git a/pyproject.toml b/pyproject.toml
index c302cff54e..da5652bd60 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.69.0rc1"
+version = "1.69.0rc2"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"