Merge branch 'master' into develop

Author: erikjohnston

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
 --------
 

debian/changelog

@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.69.0) stable; urgency=medium
+
+  * New Synapse release 1.69.0.
+
+ -- Synapse Packaging team <[email protected]>  Mon, 17 Oct 2022 11:31:03 +0100
+
 matrix-synapse-py3 (1.69.0~rc4) stable; urgency=medium
 
   * New Synapse release 1.69.0rc4.

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 <[email protected]>"]
 license = "Apache-2.0"