summary refs log tree commit diff
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-08-09 13:45:11 +0100
committerOlivier Wilkinson (reivilibre) <oliverw@matrix.org>2022-08-09 13:45:11 +0100
commit54fb517c28aea349d5aa1215e07916f721fe9d9e (patch)
tree69c534fe47c374d6b99cd1f309797a98c20e9c2b
parentStrengthen tests about deleted old push actions. (#13471) (diff)
parentFix changelog mistake (diff)
downloadsynapse-54fb517c28aea349d5aa1215e07916f721fe9d9e.tar.xz
Merge branch 'release-v1.65' into develop
-rw-r--r--CHANGES.md74
-rw-r--r--changelog.d/11897.doc1
-rw-r--r--changelog.d/12978.misc1
-rw-r--r--changelog.d/13160.misc1
-rw-r--r--changelog.d/13213.misc1
-rw-r--r--changelog.d/13221.doc1
-rw-r--r--changelog.d/13230.doc1
-rw-r--r--changelog.d/13273.feature1
-rw-r--r--changelog.d/13343.feature1
-rw-r--r--changelog.d/13346.misc1
-rw-r--r--changelog.d/13353.bugfix1
-rw-r--r--changelog.d/13355.misc1
-rw-r--r--changelog.d/13365.bugfix1
-rw-r--r--changelog.d/13368.misc1
-rw-r--r--changelog.d/13370.feature1
-rw-r--r--changelog.d/13372.docker1
-rw-r--r--changelog.d/13374.bugfix1
-rw-r--r--changelog.d/13383.misc1
-rw-r--r--changelog.d/13392.bugfix1
-rw-r--r--changelog.d/13393.misc1
-rw-r--r--changelog.d/13397.misc1
-rw-r--r--changelog.d/13403.misc1
-rw-r--r--changelog.d/13404.misc1
-rw-r--r--changelog.d/13408.bugfix1
-rw-r--r--changelog.d/13413.bugfix1
-rw-r--r--changelog.d/13416.misc1
-rw-r--r--changelog.d/13420.misc1
-rw-r--r--changelog.d/13428.feature1
-rw-r--r--changelog.d/13429.feature1
-rw-r--r--changelog.d/13431.misc1
-rw-r--r--changelog.d/13432.bugfix1
-rw-r--r--changelog.d/13435.misc1
-rw-r--r--changelog.d/13437.doc1
-rw-r--r--changelog.d/13438.doc1
-rw-r--r--changelog.d/13439.misc1
-rw-r--r--changelog.d/13441.feature1
-rw-r--r--changelog.d/13442.misc1
-rw-r--r--changelog.d/13443.doc1
-rw-r--r--changelog.d/13445.misc1
-rw-r--r--changelog.d/13447.misc1
-rw-r--r--changelog.d/13449.doc1
-rw-r--r--changelog.d/13450.doc1
-rw-r--r--changelog.d/13452.misc1
-rw-r--r--changelog.d/13455.misc1
-rw-r--r--changelog.d/13460.misc1
-rw-r--r--changelog.d/13463.misc1
-rw-r--r--changelog.d/13467.misc1
-rw-r--r--changelog.d/13469.misc1
-rw-r--r--changelog.d/13470.misc2
-rw-r--r--changelog.d/13481.doc1
-rw-r--r--debian/changelog6
-rw-r--r--pyproject.toml2
52 files changed, 81 insertions, 51 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 0e69f25e0e..823f4f40b3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,77 @@
+Synapse 1.65.0rc1 (2022-08-09)
+==============================
+
+Features
+--------
+
+- Add support for stable prefixes for [MSC2285 (private read receipts)](https://github.com/matrix-org/matrix-spec-proposals/pull/2285). ([\#13273](https://github.com/matrix-org/synapse/issues/13273))
+- Add new unstable error codes `ORG.MATRIX.MSC3848.ALREADY_JOINED`, `ORG.MATRIX.MSC3848.NOT_JOINED`, and `ORG.MATRIX.MSC3848.INSUFFICIENT_POWER` described in [MSC3848](https://github.com/matrix-org/matrix-spec-proposals/pull/3848). ([\#13343](https://github.com/matrix-org/synapse/issues/13343))
+- Use stable prefixes for [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827). ([\#13370](https://github.com/matrix-org/synapse/issues/13370))
+- Add a new module API method to translate a room alias into a room ID. ([\#13428](https://github.com/matrix-org/synapse/issues/13428))
+- Add a new module API method to create a room. ([\#13429](https://github.com/matrix-org/synapse/issues/13429))
+- Add remote join capability to the module API's `update_room_membership` method (in a backwards compatible manner). ([\#13441](https://github.com/matrix-org/synapse/issues/13441))
+
+
+Bugfixes
+--------
+
+- Update the version of the LDAP3 auth provider module included in the `matrixdotorg/synapse` DockerHub images and the Debian packages hosted on packages.matrix.org to 0.2.2. This version fixes a regression in the module. ([\#13470](https://github.com/matrix-org/synapse/issues/13470))
+- Fix a bug introduced in Synapse v1.41.0 where the `/hierarchy` API returned non-standard information (a `room_id` field under each entry in `children_state`). ([\#13365](https://github.com/matrix-org/synapse/issues/13365))
+- Fix a bug introduced in Synapse 0.24.0 that would respond with the wrong error status code to `/joined_members` requests when the requester is not a current member of the room. Contributed by @andrewdoh. ([\#13374](https://github.com/matrix-org/synapse/issues/13374))
+- Fix bug in handling of typing events for appservices. Contributed by Nick @ Beeper (@fizzadar). ([\#13392](https://github.com/matrix-org/synapse/issues/13392))
+- Fix a bug introduced in Synapse 1.57.0 where rooms listed in `exclude_rooms_from_sync` in the configuration file would not be properly excluded from incremental syncs. ([\#13408](https://github.com/matrix-org/synapse/issues/13408))
+- Fix a bug in the experimental faster-room-joins support which could cause it to get stuck in an infinite loop. ([\#13353](https://github.com/matrix-org/synapse/issues/13353))
+- Faster room joins: fix a bug which caused rejected events to become un-rejected during state syncing. ([\#13413](https://github.com/matrix-org/synapse/issues/13413))
+- Faster room joins: fix error when running out of servers to sync partial state with, so that Synapse raises the intended error instead. ([\#13432](https://github.com/matrix-org/synapse/issues/13432))
+
+
+Updates to the Docker image
+---------------------------
+
+- Make Docker images build on armv7 by installing cryptography dependencies in the 'requirements' stage. Contributed by Jasper Spaans. ([\#13372](https://github.com/matrix-org/synapse/issues/13372))
+
+
+Improved Documentation
+----------------------
+
+- Update the 'registration tokens' page to acknowledge that the relevant MSC was merged into version 1.2 of the Matrix specification. Contributed by @moan0s. ([\#11897](https://github.com/matrix-org/synapse/issues/11897))
+- Document which HTTP resources support gzip compression. ([\#13221](https://github.com/matrix-org/synapse/issues/13221))
+- Add steps describing how to elevate an existing user to administrator by manipulating the database. ([\#13230](https://github.com/matrix-org/synapse/issues/13230))
+- Fix wrong headline for `url_preview_accept_language` in documentation. ([\#13437](https://github.com/matrix-org/synapse/issues/13437))
+- Remove redundant 'Contents' section from the Configuration Manual. Contributed by @dklimpel. ([\#13438](https://github.com/matrix-org/synapse/issues/13438))
+- Update documentation for config setting `macaroon_secret_key`. ([\#13443](https://github.com/matrix-org/synapse/issues/13443))
+- Update outdated information on `sso_mapping_providers` documentation. ([\#13449](https://github.com/matrix-org/synapse/issues/13449))
+- Fix example code in module documentation of `password_auth_provider_callbacks`. ([\#13450](https://github.com/matrix-org/synapse/issues/13450))
+- Make the configuration for the cache clearer. ([\#13481](https://github.com/matrix-org/synapse/issues/13481))
+
+
+Internal Changes
+----------------
+
+- Extend the release script to automatically push a new SyTest branch, rather than having that be a manual process. ([\#12978](https://github.com/matrix-org/synapse/issues/12978))
+- Make minor clarifications to the error messages given when we fail to join a room via any server. ([\#13160](https://github.com/matrix-org/synapse/issues/13160))
+- Enable Complement CI tests in the 'latest deps' test run. ([\#13213](https://github.com/matrix-org/synapse/issues/13213))
+- Fix long-standing bugged logic which was never hit in `get_pdu` asking every remote destination even after it finds an event. ([\#13346](https://github.com/matrix-org/synapse/issues/13346))
+- Faster room joins: avoid blocking when pulling events with partially missing prev events. ([\#13355](https://github.com/matrix-org/synapse/issues/13355))
+- Instrument `/messages` for understandable traces in Jaeger. ([\#13368](https://github.com/matrix-org/synapse/issues/13368))
+- Remove an unused argument to `get_relations_for_event`. ([\#13383](https://github.com/matrix-org/synapse/issues/13383))
+- Add a `merge-back` command to the release script, which automates merging the correct branches after a release. ([\#13393](https://github.com/matrix-org/synapse/issues/13393))
+- Adding missing type hints to tests. ([\#13397](https://github.com/matrix-org/synapse/issues/13397))
+- Faster Room Joins: don't leave a stuck room partial state flag if the join fails. ([\#13403](https://github.com/matrix-org/synapse/issues/13403))
+- Refactor `_resolve_state_at_missing_prevs` to compute an `EventContext` instead. ([\#13404](https://github.com/matrix-org/synapse/issues/13404), [\#13431](https://github.com/matrix-org/synapse/issues/13431))
+- Faster Room Joins: prevent Synapse from answering federated join requests for a room which it has not fully joined yet. ([\#13416](https://github.com/matrix-org/synapse/issues/13416))
+- Re-enable running Complement tests against Synapse with workers. ([\#13420](https://github.com/matrix-org/synapse/issues/13420))
+- Prevent unnecessary lookups to any external `get_event` cache. Contributed by Nick @ Beeper (@fizzadar). ([\#13435](https://github.com/matrix-org/synapse/issues/13435))
+- Add some tracing to give more insight into local room joins. ([\#13439](https://github.com/matrix-org/synapse/issues/13439))
+- Rename class `RateLimitConfig` to `RatelimitSettings` and `FederationRateLimitConfig` to `FederationRatelimitSettings`. ([\#13442](https://github.com/matrix-org/synapse/issues/13442))
+- Add some comments about how event push actions are stored. ([\#13445](https://github.com/matrix-org/synapse/issues/13445), [\#13455](https://github.com/matrix-org/synapse/issues/13455))
+- Improve rebuild speed for the "synapse-workers" docker image. ([\#13447](https://github.com/matrix-org/synapse/issues/13447))
+- Fix `@tag_args` being off-by-one with the arguments when tagging a span (tracing). ([\#13452](https://github.com/matrix-org/synapse/issues/13452))
+- Update type of `EventContext.rejected`. ([\#13460](https://github.com/matrix-org/synapse/issues/13460))
+- Use literals in place of `HTTPStatus` constants in tests. ([\#13463](https://github.com/matrix-org/synapse/issues/13463), [\#13469](https://github.com/matrix-org/synapse/issues/13469))
+- Correct a misnamed argument in state res v2 internals. ([\#13467](https://github.com/matrix-org/synapse/issues/13467))
+
+
 Synapse 1.64.0 (2022-08-02)
 ===========================
 
diff --git a/changelog.d/11897.doc b/changelog.d/11897.doc
deleted file mode 100644
index d86b20f53d..0000000000
--- a/changelog.d/11897.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the 'registration tokens' page to acknowledge that the relevant MSC was merged into version 1.2 of the Matrix specification. Contributed by @moan0s.
diff --git a/changelog.d/12978.misc b/changelog.d/12978.misc
deleted file mode 100644
index 050c9047fc..0000000000
--- a/changelog.d/12978.misc
+++ /dev/null
@@ -1 +0,0 @@
-Extend the release script to automatically push a new SyTest branch, rather than having that be a manual process.
\ No newline at end of file
diff --git a/changelog.d/13160.misc b/changelog.d/13160.misc
deleted file mode 100644
index 36ff50c2a6..0000000000
--- a/changelog.d/13160.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make minor clarifications to the error messages given when we fail to join a room via any server.
\ No newline at end of file
diff --git a/changelog.d/13213.misc b/changelog.d/13213.misc
deleted file mode 100644
index b50d26ac0c..0000000000
--- a/changelog.d/13213.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable Complement CI tests in the 'latest deps' test run.
\ No newline at end of file
diff --git a/changelog.d/13221.doc b/changelog.d/13221.doc
deleted file mode 100644
index dd2b3d8972..0000000000
--- a/changelog.d/13221.doc
+++ /dev/null
@@ -1 +0,0 @@
-Document which HTTP resources support gzip compression.
diff --git a/changelog.d/13230.doc b/changelog.d/13230.doc
deleted file mode 100644
index dce7be2425..0000000000
--- a/changelog.d/13230.doc
+++ /dev/null
@@ -1 +0,0 @@
-Add steps describing how to elevate an existing user to administrator by manipulating the database.
diff --git a/changelog.d/13273.feature b/changelog.d/13273.feature
deleted file mode 100644
index 53110d74e9..0000000000
--- a/changelog.d/13273.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for stable prefixes for [MSC2285 (private read receipts)](https://github.com/matrix-org/matrix-spec-proposals/pull/2285).
diff --git a/changelog.d/13343.feature b/changelog.d/13343.feature
deleted file mode 100644
index c151251e54..0000000000
--- a/changelog.d/13343.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add new unstable error codes `ORG.MATRIX.MSC3848.ALREADY_JOINED`, `ORG.MATRIX.MSC3848.NOT_JOINED`, and `ORG.MATRIX.MSC3848.INSUFFICIENT_POWER` described in MSC3848.
\ No newline at end of file
diff --git a/changelog.d/13346.misc b/changelog.d/13346.misc
deleted file mode 100644
index 06557c8481..0000000000
--- a/changelog.d/13346.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix long-standing bugged logic which was never hit in `get_pdu` asking every remote destination even after it finds an event.
diff --git a/changelog.d/13353.bugfix b/changelog.d/13353.bugfix
deleted file mode 100644
index 8e18bfae1f..0000000000
--- a/changelog.d/13353.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug in the experimental faster-room-joins support which could cause it to get stuck in an infinite loop.
diff --git a/changelog.d/13355.misc b/changelog.d/13355.misc
deleted file mode 100644
index 7715075885..0000000000
--- a/changelog.d/13355.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster room joins: avoid blocking when pulling events with partially missing prev events.
diff --git a/changelog.d/13365.bugfix b/changelog.d/13365.bugfix
deleted file mode 100644
index b915c3158c..0000000000
--- a/changelog.d/13365.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse v1.41.0 where the `/hierarchy` API returned non-standard information (a `room_id` field under each entry in `children_state`).
diff --git a/changelog.d/13368.misc b/changelog.d/13368.misc
deleted file mode 100644
index 4b433a5107..0000000000
--- a/changelog.d/13368.misc
+++ /dev/null
@@ -1 +0,0 @@
-Instrument `/messages` for understandable traces in Jaeger.
diff --git a/changelog.d/13370.feature b/changelog.d/13370.feature
deleted file mode 100644
index 3a49bc2778..0000000000
--- a/changelog.d/13370.feature
+++ /dev/null
@@ -1 +0,0 @@
-Use stable prefixes for [MSC3827](https://github.com/matrix-org/matrix-spec-proposals/pull/3827).
diff --git a/changelog.d/13372.docker b/changelog.d/13372.docker
deleted file mode 100644
index 238c78de09..0000000000
--- a/changelog.d/13372.docker
+++ /dev/null
@@ -1 +0,0 @@
-Make docker images build on armv7 by installing cryptography dependencies in the "requirements" stage. Contributed by Jasper Spaans.
\ No newline at end of file
diff --git a/changelog.d/13374.bugfix b/changelog.d/13374.bugfix
deleted file mode 100644
index 1c5bd1b363..0000000000
--- a/changelog.d/13374.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 0.24.0 that would respond with the wrong error status code to `/joined_members` requests when the requester is not a current member of the room. Contributed by @andrewdoh.
\ No newline at end of file
diff --git a/changelog.d/13383.misc b/changelog.d/13383.misc
deleted file mode 100644
index 2236eced24..0000000000
--- a/changelog.d/13383.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove an unused argument to `get_relations_for_event`.
diff --git a/changelog.d/13392.bugfix b/changelog.d/13392.bugfix
deleted file mode 100644
index 7d83c77550..0000000000
--- a/changelog.d/13392.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug in handling of typing events for appservices. Contributed by Nick @ Beeper (@fizzadar).
diff --git a/changelog.d/13393.misc b/changelog.d/13393.misc
deleted file mode 100644
index be2b0153ea..0000000000
--- a/changelog.d/13393.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a `merge-back` command to the release script, which automates merging the correct branches after a release.
\ No newline at end of file
diff --git a/changelog.d/13397.misc b/changelog.d/13397.misc
deleted file mode 100644
index 8dc610d9e2..0000000000
--- a/changelog.d/13397.misc
+++ /dev/null
@@ -1 +0,0 @@
-Adding missing type hints to tests.
diff --git a/changelog.d/13403.misc b/changelog.d/13403.misc
deleted file mode 100644
index cb7b38153c..0000000000
--- a/changelog.d/13403.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster Room Joins: don't leave a stuck room partial state flag if the join fails.
diff --git a/changelog.d/13404.misc b/changelog.d/13404.misc
deleted file mode 100644
index 655be4061b..0000000000
--- a/changelog.d/13404.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `_resolve_state_at_missing_prevs` to compute an `EventContext` instead.
diff --git a/changelog.d/13408.bugfix b/changelog.d/13408.bugfix
deleted file mode 100644
index 8b87b2cf7b..0000000000
--- a/changelog.d/13408.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.57.0 where rooms listed in `exclude_rooms_from_sync` in the configuration file would not be properly excluded from incremental syncs.
diff --git a/changelog.d/13413.bugfix b/changelog.d/13413.bugfix
deleted file mode 100644
index a0ce884274..0000000000
--- a/changelog.d/13413.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Faster room joins: fix a bug which caused rejected events to become un-rejected during state syncing.
\ No newline at end of file
diff --git a/changelog.d/13416.misc b/changelog.d/13416.misc
deleted file mode 100644
index 2904e73376..0000000000
--- a/changelog.d/13416.misc
+++ /dev/null
@@ -1 +0,0 @@
-Faster Room Joins: prevent Synapse from answering federated join requests for a room which it has not fully joined yet.
\ No newline at end of file
diff --git a/changelog.d/13420.misc b/changelog.d/13420.misc
deleted file mode 100644
index ff1a68e2e8..0000000000
--- a/changelog.d/13420.misc
+++ /dev/null
@@ -1 +0,0 @@
-Re-enable running Complement tests against Synapse with workers.
\ No newline at end of file
diff --git a/changelog.d/13428.feature b/changelog.d/13428.feature
deleted file mode 100644
index 085b61483f..0000000000
--- a/changelog.d/13428.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a module API method to translate a room alias into a room ID.
diff --git a/changelog.d/13429.feature b/changelog.d/13429.feature
deleted file mode 100644
index f4f347e54e..0000000000
--- a/changelog.d/13429.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a module API method to create a room.
diff --git a/changelog.d/13431.misc b/changelog.d/13431.misc
deleted file mode 100644
index 655be4061b..0000000000
--- a/changelog.d/13431.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `_resolve_state_at_missing_prevs` to compute an `EventContext` instead.
diff --git a/changelog.d/13432.bugfix b/changelog.d/13432.bugfix
deleted file mode 100644
index bb99616afc..0000000000
--- a/changelog.d/13432.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Faster room joins: Fix error when running out of servers to sync partial state with, so that Synapse raises the intended error instead.
diff --git a/changelog.d/13435.misc b/changelog.d/13435.misc
deleted file mode 100644
index c01b9136c8..0000000000
--- a/changelog.d/13435.misc
+++ /dev/null
@@ -1 +0,0 @@
-Prevent unnecessary lookups to any external `get_event` cache. Contributed by Nick @ Beeper (@fizzadar).
diff --git a/changelog.d/13437.doc b/changelog.d/13437.doc
deleted file mode 100644
index fb772b24dc..0000000000
--- a/changelog.d/13437.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix wrong headline for `url_preview_accept_language` in documentation.
diff --git a/changelog.d/13438.doc b/changelog.d/13438.doc
deleted file mode 100644
index 163b63ffc6..0000000000
--- a/changelog.d/13438.doc
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant 'Contents' section from the Configuration Manual. Contributed by @dklimpel.
diff --git a/changelog.d/13439.misc b/changelog.d/13439.misc
deleted file mode 100644
index 4aa73d7075..0000000000
--- a/changelog.d/13439.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some tracing to give more insight into local room joins.
diff --git a/changelog.d/13441.feature b/changelog.d/13441.feature
deleted file mode 100644
index 3a4ae8bf01..0000000000
--- a/changelog.d/13441.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add remote join capability to the module API's `update_room_membership` method (in a backwards compatible manner).
diff --git a/changelog.d/13442.misc b/changelog.d/13442.misc
deleted file mode 100644
index f503bc79d3..0000000000
--- a/changelog.d/13442.misc
+++ /dev/null
@@ -1 +0,0 @@
-Rename class `RateLimitConfig` to `RatelimitSettings` and `FederationRateLimitConfig` to `FederationRatelimitSettings`.
\ No newline at end of file
diff --git a/changelog.d/13443.doc b/changelog.d/13443.doc
deleted file mode 100644
index 0db5d1b3b4..0000000000
--- a/changelog.d/13443.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update documentation for config setting `macaroon_secret_key`.
\ No newline at end of file
diff --git a/changelog.d/13445.misc b/changelog.d/13445.misc
deleted file mode 100644
index 17462c56f3..0000000000
--- a/changelog.d/13445.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some comments about how event push actions are stored.
diff --git a/changelog.d/13447.misc b/changelog.d/13447.misc
deleted file mode 100644
index ede3ee91b8..0000000000
--- a/changelog.d/13447.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve rebuild speed for the "synapse-workers" docker image.
diff --git a/changelog.d/13449.doc b/changelog.d/13449.doc
deleted file mode 100644
index cbe4f62b6e..0000000000
--- a/changelog.d/13449.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update outdated information on `sso_mapping_providers` documentation.
diff --git a/changelog.d/13450.doc b/changelog.d/13450.doc
deleted file mode 100644
index e272baff0a..0000000000
--- a/changelog.d/13450.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fix example code in module documentation of `password_auth_provider_callbacks`.
diff --git a/changelog.d/13452.misc b/changelog.d/13452.misc
deleted file mode 100644
index 13d1523de2..0000000000
--- a/changelog.d/13452.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `@tag_args` being off-by-one with the arguments when tagging a span (tracing).
diff --git a/changelog.d/13455.misc b/changelog.d/13455.misc
deleted file mode 100644
index 17462c56f3..0000000000
--- a/changelog.d/13455.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some comments about how event push actions are stored.
diff --git a/changelog.d/13460.misc b/changelog.d/13460.misc
deleted file mode 100644
index f9e9de219d..0000000000
--- a/changelog.d/13460.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update type of `EventContext.rejected`.
diff --git a/changelog.d/13463.misc b/changelog.d/13463.misc
deleted file mode 100644
index a4c8691144..0000000000
--- a/changelog.d/13463.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use literals in place of `HTTPStatus` constants in tests.
diff --git a/changelog.d/13467.misc b/changelog.d/13467.misc
deleted file mode 100644
index b8b7d65c16..0000000000
--- a/changelog.d/13467.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correct a misnamed argument in state res v2 internals.
diff --git a/changelog.d/13469.misc b/changelog.d/13469.misc
deleted file mode 100644
index 315930deab..0000000000
--- a/changelog.d/13469.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use literals in place of `HTTPStatus` constants in tests.
\ No newline at end of file
diff --git a/changelog.d/13470.misc b/changelog.d/13470.misc
deleted file mode 100644
index 33cfa58167..0000000000
--- a/changelog.d/13470.misc
+++ /dev/null
@@ -1,2 +0,0 @@
-Update the version of matrix-ldap-3 included in the matrixdotorg/synapse DockerHub images and the Debian packages
-hosted on packages.matrix.org to 0.2.2. This version fixes a regression in the plugin.
diff --git a/changelog.d/13481.doc b/changelog.d/13481.doc
deleted file mode 100644
index b07a6a8a9e..0000000000
--- a/changelog.d/13481.doc
+++ /dev/null
@@ -1 +0,0 @@
-Make the configuration for the cache clearer.
diff --git a/debian/changelog b/debian/changelog
index 9efcb4f132..6e4bdc3a00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.65.0~rc1) stable; urgency=medium
+
+  * New Synapse release 1.65.0rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 09 Aug 2022 11:39:29 +0100
+
 matrix-synapse-py3 (1.64.0) stable; urgency=medium
 
   * New Synapse release 1.64.0.
diff --git a/pyproject.toml b/pyproject.toml
index af7def0c53..ad2224f564 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ skip_gitignore = true
 
 [tool.poetry]
 name = "matrix-synapse"
-version = "1.64.0"
+version = "1.65.0rc1"
 description = "Homeserver for the Matrix decentralised comms protocol"
 authors = ["Matrix.org Team and Contributors <packages@matrix.org>"]
 license = "Apache-2.0"