summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2022-10-17 17:04:40 +0100
committerErik Johnston <erik@matrix.org>2022-10-17 17:04:40 +0100
commit130668b66c3b3f9bf222c16dcaf40b43a7deeb72 (patch)
tree6b0df9554c71c644f6164a86cfd3894eaaefed10
parentSupport filtering the /messages API by relation type (MSC3874). (#14148) (diff)
parent1.69.0 (diff)
downloadsynapse-130668b66c3b3f9bf222c16dcaf40b43a7deeb72.tar.xz
Merge branch 'master' into develop
-rw-r--r--CHANGES.md10
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
3 files changed, 15 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index b3b22b6d14..c373b2a846 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,17 @@
-Synapse 1.69.0rc4 (2022-10-14)
-==============================
+Synapse 1.69.0 (2022-10-17)
+===========================
 
 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.
 
 
+No significant changes since 1.69.0rc4.
+
+
+Synapse 1.69.0rc4 (2022-10-14)
+==============================
+
 Bugfixes
 --------
 
diff --git a/debian/changelog b/debian/changelog
index 1a84b8cd51..f1de7b15d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.69.0) stable; urgency=medium
+
+  * New Synapse release 1.69.0.
+
+ -- Synapse Packaging team <packages@matrix.org>  Mon, 17 Oct 2022 11:31:03 +0100
+
 matrix-synapse-py3 (1.69.0~rc4) stable; urgency=medium
 
   * New Synapse release 1.69.0rc4.
diff --git a/pyproject.toml b/pyproject.toml
index 4f6c919c96..6c1dc8b8b5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,7 +57,7 @@ manifest-path = "rust/Cargo.toml"
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.69.0rc4"
+version = "1.69.0"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"