summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.md10
-rw-r--r--changelog.d/13842.removal1
-rw-r--r--changelog.d/14073.misc1
-rw-r--r--changelog.d/14080.misc1
-rw-r--r--debian/changelog2
5 files changed, 10 insertions, 5 deletions
diff --git a/CHANGES.md b/CHANGES.md
index bb3ba7cff2..66c99b86d1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-Synapse 1.69.0rc2 (2022-10-06)
+Synapse 1.69.0rc3 (2022-10-06)
 ==============================
 
 Please note that legacy Prometheus metric names are now deprecated and will be removed in Synapse 1.73.0.
@@ -6,10 +6,18 @@ Server administrators should update their dashboards and alerting rules to avoid
 See the [upgrade notes](https://matrix-org.github.io/synapse/v1.69/upgrade.html#upgrading-to-v1690) for more details.
 
 
+Deprecations and Removals
+-------------------------
+
+- Deprecate the `generate_short_term_login_token` method in favor of an async `create_login_token` method in the Module API. ([\#13842](https://github.com/matrix-org/synapse/issues/13842))
+
+
 Internal Changes
 ----------------
 
 - Ensure Synapse v1.69 works with upcoming database changes in v1.70. ([\#14045](https://github.com/matrix-org/synapse/issues/14045))
+- Fix a bug introduced in Synapse 1.68.0 where messages could not be sent in rooms with non-integer `notifications` power level. ([\#14073](https://github.com/matrix-org/synapse/issues/14073))
+- Pin build-system requirements. ([\#14080](https://github.com/matrix-org/synapse/issues/14080))
 
 
 Synapse 1.69.0rc1 (2022-10-04)
diff --git a/changelog.d/13842.removal b/changelog.d/13842.removal
deleted file mode 100644
index cbcff38e91..0000000000
--- a/changelog.d/13842.removal
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate the `generate_short_term_login_token` method in favor of an async `create_login_token` method in the Module API.
diff --git a/changelog.d/14073.misc b/changelog.d/14073.misc
deleted file mode 100644
index 7775500194..0000000000
--- a/changelog.d/14073.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.68.0 where messages could not be sent in rooms with non-integer `notifications` power level.
diff --git a/changelog.d/14080.misc b/changelog.d/14080.misc
deleted file mode 100644
index f4b3ab7a93..0000000000
--- a/changelog.d/14080.misc
+++ /dev/null
@@ -1 +0,0 @@
-Pin build-system requirements.
diff --git a/debian/changelog b/debian/changelog
index 5323843b87..b228ef35fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ 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
+ -- Synapse Packaging team <packages@matrix.org>  Thu, 06 Oct 2022 14:45:00 +0100
 
 matrix-synapse-py3 (1.69.0~rc1) stable; urgency=medium