1.49.0rc1

65 files changed, 87 insertions, 63 deletions

diff --git a/CHANGES.md b/CHANGES.md
index f398b8e9c5..66ec691af0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,83 @@
+Synapse 1.49.0rc1 (2021-12-07)
+==============================
+
+Features
+--------
+
+- Add [MSC3030](https://github.com/matrix-org/matrix-doc/pull/3030) experimental client and federation API endpoints to get the closest event to a given timestamp. ([\#9445](https://github.com/matrix-org/synapse/issues/9445))
+- When returning relation events from the `/relations` API, bundle any relations of those relations into the result, per updates to [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675). ([\#11284](https://github.com/matrix-org/synapse/issues/11284))
+- Add plugin support for controlling database background updates. ([\#11306](https://github.com/matrix-org/synapse/issues/11306), [\#11475](https://github.com/matrix-org/synapse/issues/11475), [\#11479](https://github.com/matrix-org/synapse/issues/11479))
+- Support the stable API endpoints for [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946): the room `/hierarchy` endpoint. ([\#11329](https://github.com/matrix-org/synapse/issues/11329))
+- Add admin API to get some information about federation status with remote servers. ([\#11407](https://github.com/matrix-org/synapse/issues/11407))
+- Support expiry of refresh tokens and expiry of the overall session when refresh tokens are in use. ([\#11425](https://github.com/matrix-org/synapse/issues/11425))
+- Stabilise support for [MSC2918](https://github.com/matrix-org/matrix-doc/blob/main/proposals/2918-refreshtokens.md#msc2918-refresh-tokens) refresh tokens as they have now been merged into the Matrix specification. ([\#11435](https://github.com/matrix-org/synapse/issues/11435), [\#11522](https://github.com/matrix-org/synapse/issues/11522))
+- Support configuring the lifetime of non-refreshable access tokens separately to refreshable access tokens. ([\#11445](https://github.com/matrix-org/synapse/issues/11445))
+- Expose synapse_homeserver and synapse_worker commands as entry points to run Synapse's main process and worker processes, respectively. Contributed by @Ma27. ([\#11449](https://github.com/matrix-org/synapse/issues/11449))
+- `synctl stop` will now wait for Synapse to exit before returning. ([\#11459](https://github.com/matrix-org/synapse/issues/11459), [\#11490](https://github.com/matrix-org/synapse/issues/11490))
+- Extend the "delete room" admin api to work correctly on rooms which have previously been partially deleted. ([\#11523](https://github.com/matrix-org/synapse/issues/11523))
+
+
+Bugfixes
+--------
+
+- Fix using MSC2716 batch sending in combination with event persistence workers. Contributed by @tulir at Beeper. ([\#11220](https://github.com/matrix-org/synapse/issues/11220))
+- Fix a long-standing bug where all requests that read events from the database could get stuck as a result of losing the database connection, for real this time. Also fix a race condition introduced in the previous insufficient fix in 1.47.0. ([\#11376](https://github.com/matrix-org/synapse/issues/11376))
+- The `/send_join` response now includes the stable `event` field instead of the unstable field from [MSC3083](https://github.com/matrix-org/matrix-doc/pull/3083). ([\#11413](https://github.com/matrix-org/synapse/issues/11413))
+- Fix a bug introduced in 1.47.0 where `send_join` could fail due to an outdated `ijson` version. ([\#11439](https://github.com/matrix-org/synapse/issues/11439), [\#11441](https://github.com/matrix-org/synapse/issues/11441))
+- Fix a bug introduced in Synapse 1.36 which could cause problems fetching event-signing keys from trusted key servers. ([\#11440](https://github.com/matrix-org/synapse/issues/11440))
+- Fix a bug introduced in 1.47.1 where the media repository would fail to work if the media store path contained any symbolic links. ([\#11446](https://github.com/matrix-org/synapse/issues/11446))
+- Add support for the `/_matrix/client/v3/login/sso/redirect/{idpId}` API from Matrix v1.1. This endpoint was overlooked when support for v3 endpoints was added in v1.48.0rc1. ([\#11451](https://github.com/matrix-org/synapse/issues/11451))
+- Fix an `LruCache` corruption bug, introduced in 1.38.0, that would cause certain requests to fail until the next Synapse restart. ([\#11454](https://github.com/matrix-org/synapse/issues/11454))
+- Include bundled relation aggregations during a limited `/sync` request, per [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675). ([\#11478](https://github.com/matrix-org/synapse/issues/11478))
+- Fix a long-standing bug where invites from ignored users were included in incremental syncs. ([\#11511](https://github.com/matrix-org/synapse/issues/11511))
+- Fix a regression in Synapse 1.48.0 where presence workers would not clear their presence updates over replication on shutdown. ([\#11518](https://github.com/matrix-org/synapse/issues/11518))
+- Fix a regression in Synapse 1.48.0 where the module API's `looping_background_call` method would spam errors to the logs when given a non-async function. ([\#11524](https://github.com/matrix-org/synapse/issues/11524))
+
+
+Updates to the Docker image
+---------------------------
+
+- Update `Dockerfile-workers` to healthcheck all workers in container. ([\#11429](https://github.com/matrix-org/synapse/issues/11429))
+
+
+Improved Documentation
+----------------------
+
+- Update the media repository documentation. ([\#11415](https://github.com/matrix-org/synapse/issues/11415))
+- Update section about backward extremities in the room DAG concepts doc to correct the misconception about backward extremities indicating whether we have fetched an events' `prev_events`. ([\#11469](https://github.com/matrix-org/synapse/issues/11469))
+
+
+Internal Changes
+----------------
+
+- Improve type annotations in `synapse.module_api`. ([\#11029](https://github.com/matrix-org/synapse/issues/11029))
+- Add `Final` annotation to string constants in `synapse.api.constants` so that they get typed as `Literal`s. ([\#11356](https://github.com/matrix-org/synapse/issues/11356))
+- Add wiki pages to documentation website. ([\#11402](https://github.com/matrix-org/synapse/issues/11402))
+- Improve internal types in push code. ([\#11409](https://github.com/matrix-org/synapse/issues/11409))
+- Add type hints to storage classes. ([\#11411](https://github.com/matrix-org/synapse/issues/11411))
+- Add a check to ensure that users cannot start the Synapse master process when `worker_app` is set. ([\#11416](https://github.com/matrix-org/synapse/issues/11416))
+- Refactor `backfilled` into specific behavior function arguments (`_persist_events_and_state_updates` and downstream calls). ([\#11417](https://github.com/matrix-org/synapse/issues/11417))
+- Add type annotations to some of the configuration surrounding refresh tokens. ([\#11428](https://github.com/matrix-org/synapse/issues/11428))
+- Update [MSC2918 refresh token](https://github.com/matrix-org/matrix-doc/blob/main/proposals/2918-refreshtokens.md#msc2918-refresh-tokens) support to confirm with the latest revision: accept the `refresh_tokens` parameter in the request body rather than in the URL parameters. ([\#11430](https://github.com/matrix-org/synapse/issues/11430))
+- Convert status codes to `HTTPStatus` in `synapse.rest.admin`. ([\#11452](https://github.com/matrix-org/synapse/issues/11452), [\#11455](https://github.com/matrix-org/synapse/issues/11455))
+- Improve type hints for `LruCache`. ([\#11453](https://github.com/matrix-org/synapse/issues/11453))
+- Fix a bug introduced in 1.47.0 where `send_join` could fail due to an outdated `ijson` version. ([\#11460](https://github.com/matrix-org/synapse/issues/11460))
+- Remove unnecessary `json.dumps` from `tests.rest.admin`. ([\#11461](https://github.com/matrix-org/synapse/issues/11461))
+- Add missing type hints to `synapse.config` module. ([\#11465](https://github.com/matrix-org/synapse/issues/11465))
+- Update and clean up recently ported documentation pages. ([\#11466](https://github.com/matrix-org/synapse/issues/11466))
+- Add a note about postgres memory management and hugepages to postgres doc. ([\#11467](https://github.com/matrix-org/synapse/issues/11467))
+- Refactor `get_version_string` to fix-up types and duplicated code. ([\#11468](https://github.com/matrix-org/synapse/issues/11468))
+- Save the OpenID Connect session ID on login. ([\#11482](https://github.com/matrix-org/synapse/issues/11482))
+- Add missing type hints to `synapse.federation`. ([\#11483](https://github.com/matrix-org/synapse/issues/11483))
+- Extend the `scripts-dev/sign_json` script to support signing events. ([\#11486](https://github.com/matrix-org/synapse/issues/11486))
+- Add type annotations to `tests.storage.test_appservice`. ([\#11488](https://github.com/matrix-org/synapse/issues/11488), [\#11492](https://github.com/matrix-org/synapse/issues/11492))
+- Clean up `tests.storage.test_main` to remove use of legacy code. ([\#11493](https://github.com/matrix-org/synapse/issues/11493))
+- Refactor various parts of the `/sync` handler. ([\#11494](https://github.com/matrix-org/synapse/issues/11494), [\#11515](https://github.com/matrix-org/synapse/issues/11515))
+- Clean up `tests.test_visibility` to remove legacy code. ([\#11495](https://github.com/matrix-org/synapse/issues/11495))
+- Preparation for database schema simplifications: disambiguate queries on `state_key`. ([\#11497](https://github.com/matrix-org/synapse/issues/11497))
+- Add type hints to `synapse/tests/rest/admin`. ([\#11501](https://github.com/matrix-org/synapse/issues/11501))
+
+
 UNRELEASED
 ==========
 
diff --git a/changelog.d/11029.misc b/changelog.d/11029.misc
deleted file mode 100644
index 111de5fc7a..0000000000
--- a/changelog.d/11029.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type annotations in `synapse.module_api`.
\ No newline at end of file
diff --git a/changelog.d/11220.bugfix b/changelog.d/11220.bugfix
deleted file mode 100644
index 8baae28d5b..0000000000
--- a/changelog.d/11220.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix using MSC2716 batch sending in combination with event persistence workers. Contributed by @tulir at Beeper.
diff --git a/changelog.d/11284.feature b/changelog.d/11284.feature
deleted file mode 100644
index cbaa5a988c..0000000000
--- a/changelog.d/11284.feature
+++ /dev/null
@@ -1 +0,0 @@
-When returning relation events from the `/relations` API, bundle any relations of those relations into the result, per updates to [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675).
diff --git a/changelog.d/11306.feature b/changelog.d/11306.feature
deleted file mode 100644
index aba3292015..0000000000
--- a/changelog.d/11306.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add plugin support for controlling database background updates.
diff --git a/changelog.d/11329.feature b/changelog.d/11329.feature
deleted file mode 100644
index 7e0efb3b00..0000000000
--- a/changelog.d/11329.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support the stable API endpoints for [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946): the room `/hierarchy` endpoint.
diff --git a/changelog.d/11356.misc b/changelog.d/11356.misc
deleted file mode 100644
index 01ce6a306c..0000000000
--- a/changelog.d/11356.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `Final` annotation to string constants in `synapse.api.constants` so that they get typed as `Literal`s.
diff --git a/changelog.d/11376.bugfix b/changelog.d/11376.bugfix
deleted file mode 100644
index 639e48b59b..0000000000
--- a/changelog.d/11376.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where all requests that read events from the database could get stuck as a result of losing the database connection, for real this time. Also fix a race condition introduced in the previous insufficient fix in 1.47.0.
diff --git a/changelog.d/11402.misc b/changelog.d/11402.misc
deleted file mode 100644
index c956338744..0000000000
--- a/changelog.d/11402.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add wiki pages to documentation website.
\ No newline at end of file
diff --git a/changelog.d/11407.feature b/changelog.d/11407.feature
deleted file mode 100644
index 1d21bde98f..0000000000
--- a/changelog.d/11407.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add admin API to get some information about federation status with remote servers.
\ No newline at end of file
diff --git a/changelog.d/11409.misc b/changelog.d/11409.misc
deleted file mode 100644
index f9e8ae9e3a..0000000000
--- a/changelog.d/11409.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve internal types in push code.
diff --git a/changelog.d/11411.misc b/changelog.d/11411.misc
deleted file mode 100644
index 86594a332d..0000000000
--- a/changelog.d/11411.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to storage classes.
diff --git a/changelog.d/11413.bugfix b/changelog.d/11413.bugfix
deleted file mode 100644
index 44111d8152..0000000000
--- a/changelog.d/11413.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-The `/send_join` response now includes the stable `event` field instead of the unstable field from [MSC3083](https://github.com/matrix-org/matrix-doc/pull/3083).
diff --git a/changelog.d/11415.doc b/changelog.d/11415.doc
deleted file mode 100644
index e405531867..0000000000
--- a/changelog.d/11415.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the media repository documentation.
diff --git a/changelog.d/11416.misc b/changelog.d/11416.misc
deleted file mode 100644
index a5c3aeda83..0000000000
--- a/changelog.d/11416.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a check to ensure that users cannot start the Synapse master process when `worker_app` is set.
\ No newline at end of file
diff --git a/changelog.d/11417.misc b/changelog.d/11417.misc
deleted file mode 100644
index 88dc4722da..0000000000
--- a/changelog.d/11417.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `backfilled` into specific behavior function arguments (`_persist_events_and_state_updates` and downstream calls).
diff --git a/changelog.d/11425.feature b/changelog.d/11425.feature
deleted file mode 100644
index 806dd5d91c..0000000000
--- a/changelog.d/11425.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support expiry of refresh tokens and expiry of the overall session when refresh tokens are in use.
\ No newline at end of file
diff --git a/changelog.d/11428.misc b/changelog.d/11428.misc
deleted file mode 100644
index 2f814fa5fb..0000000000
--- a/changelog.d/11428.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type annotations to some of the configuration surrounding refresh tokens.
\ No newline at end of file
diff --git a/changelog.d/11429.docker b/changelog.d/11429.docker
deleted file mode 100644
index 81db719ed6..0000000000
--- a/changelog.d/11429.docker
+++ /dev/null
@@ -1 +0,0 @@
-Update `Dockerfile-workers` to healthcheck all workers in container.
diff --git a/changelog.d/11430.misc b/changelog.d/11430.misc
deleted file mode 100644
index 28f06f4c4e..0000000000
--- a/changelog.d/11430.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update [MSC2918 refresh token](https://github.com/matrix-org/matrix-doc/blob/main/proposals/2918-refreshtokens.md#msc2918-refresh-tokens) support to confirm with the latest revision: accept the `refresh_tokens` parameter in the request body rather than in the URL parameters.
\ No newline at end of file
diff --git a/changelog.d/11435.feature b/changelog.d/11435.feature
deleted file mode 100644
index 9e127fae3c..0000000000
--- a/changelog.d/11435.feature
+++ /dev/null
@@ -1 +0,0 @@
-Stabilise support for [MSC2918](https://github.com/matrix-org/matrix-doc/blob/main/proposals/2918-refreshtokens.md#msc2918-refresh-tokens) refresh tokens as they have now been merged into the Matrix specification.
\ No newline at end of file
diff --git a/changelog.d/11439.bugfix b/changelog.d/11439.bugfix
deleted file mode 100644
index fc6bc82b36..0000000000
--- a/changelog.d/11439.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in 1.47.0 where `send_join` could fail due to an outdated `ijson` version.
diff --git a/changelog.d/11440.bugfix b/changelog.d/11440.bugfix
deleted file mode 100644
index 02ce2e428f..0000000000
--- a/changelog.d/11440.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in Synapse 1.36 which could cause problems fetching event-signing keys from trusted key servers.
diff --git a/changelog.d/11441.bugfix b/changelog.d/11441.bugfix
deleted file mode 100644
index 1baef41d70..0000000000
--- a/changelog.d/11441.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in 1.47.0 where `send_join` could fail due to an outdated `ijson` version.
\ No newline at end of file
diff --git a/changelog.d/11445.feature b/changelog.d/11445.feature
deleted file mode 100644
index 211a722b65..0000000000
--- a/changelog.d/11445.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support configuring the lifetime of non-refreshable access tokens separately to refreshable access tokens.
\ No newline at end of file
diff --git a/changelog.d/11446.bugfix b/changelog.d/11446.bugfix
deleted file mode 100644
index fa5e055d50..0000000000
--- a/changelog.d/11446.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in 1.47.1 where the media repository would fail to work if the media store path contained any symbolic links.
diff --git a/changelog.d/11449.feature b/changelog.d/11449.feature
deleted file mode 100644
index 94bc175db9..0000000000
--- a/changelog.d/11449.feature
+++ /dev/null
@@ -1 +0,0 @@
-Expose synapse_homeserver and synapse_worker commands as entry points to run Synapse's main process and worker processes, respectively. Contributed by @Ma27.
diff --git a/changelog.d/11451.bugfix b/changelog.d/11451.bugfix
deleted file mode 100644
index 960714d0f9..0000000000
--- a/changelog.d/11451.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Add support for the `/_matrix/client/v3/login/sso/redirect/{idpId}` API from Matrix v1.1. This endpoint was overlooked when support for v3 endpoints was added in v1.48.0rc1.
diff --git a/changelog.d/11452.misc b/changelog.d/11452.misc
deleted file mode 100644
index 7c83f62e3f..0000000000
--- a/changelog.d/11452.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert status codes to `HTTPStatus` in `synapse.rest.admin`.
\ No newline at end of file
diff --git a/changelog.d/11453.misc b/changelog.d/11453.misc
deleted file mode 100644
index a31ab826e5..0000000000
--- a/changelog.d/11453.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve type hints for `LruCache`.
diff --git a/changelog.d/11454.bugfix b/changelog.d/11454.bugfix
deleted file mode 100644
index 096265cbc9..0000000000
--- a/changelog.d/11454.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix an `LruCache` corruption bug, introduced in 1.38.0, that would cause certain requests to fail until the next Synapse restart.
diff --git a/changelog.d/11455.misc b/changelog.d/11455.misc
deleted file mode 100644
index 7c83f62e3f..0000000000
--- a/changelog.d/11455.misc
+++ /dev/null
@@ -1 +0,0 @@
-Convert status codes to `HTTPStatus` in `synapse.rest.admin`.
\ No newline at end of file
diff --git a/changelog.d/11459.feature b/changelog.d/11459.feature
deleted file mode 100644
index 4cb97dc1d0..0000000000
--- a/changelog.d/11459.feature
+++ /dev/null
@@ -1 +0,0 @@
-`synctl stop` will now wait for Synapse to exit before returning.
diff --git a/changelog.d/11460.misc b/changelog.d/11460.misc
deleted file mode 100644
index fc6bc82b36..0000000000
--- a/changelog.d/11460.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in 1.47.0 where `send_join` could fail due to an outdated `ijson` version.
diff --git a/changelog.d/11461.misc b/changelog.d/11461.misc
deleted file mode 100644
index 92133f9eaa..0000000000
--- a/changelog.d/11461.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unnecessary `json.dumps` from `tests.rest.admin`.
\ No newline at end of file
diff --git a/changelog.d/11465.misc b/changelog.d/11465.misc
deleted file mode 100644
index aadc938b2b..0000000000
--- a/changelog.d/11465.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to `synapse.config` module.
diff --git a/changelog.d/11466.misc b/changelog.d/11466.misc
deleted file mode 100644
index 4317d017d7..0000000000
--- a/changelog.d/11466.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update and clean up recently ported documentation pages.
\ No newline at end of file
diff --git a/changelog.d/11467.misc b/changelog.d/11467.misc
deleted file mode 100644
index 84e8a5ab4e..0000000000
--- a/changelog.d/11467.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a note about postgres memory management and hugepages to postgres doc.
\ No newline at end of file
diff --git a/changelog.d/11468.misc b/changelog.d/11468.misc
deleted file mode 100644
index 6fc0b5bcab..0000000000
--- a/changelog.d/11468.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor `get_version_string` to fix-up types and duplicated code.
diff --git a/changelog.d/11469.doc b/changelog.d/11469.doc
deleted file mode 100644
index 51602aa968..0000000000
--- a/changelog.d/11469.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update section about backward extremities in the room DAG concepts doc to correct the misconception about backward extremities indicating whether we have fetched an events' `prev_events`.
diff --git a/changelog.d/11475.feature b/changelog.d/11475.feature
deleted file mode 100644
index aba3292015..0000000000
--- a/changelog.d/11475.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add plugin support for controlling database background updates.
diff --git a/changelog.d/11478.bugfix b/changelog.d/11478.bugfix
deleted file mode 100644
index 5f02636f50..0000000000
--- a/changelog.d/11478.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Include bundled relation aggregations during a limited `/sync` request, per [MSC2675](https://github.com/matrix-org/matrix-doc/pull/2675).
diff --git a/changelog.d/11479.feature b/changelog.d/11479.feature
deleted file mode 100644
index aba3292015..0000000000
--- a/changelog.d/11479.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add plugin support for controlling database background updates.
diff --git a/changelog.d/11482.misc b/changelog.d/11482.misc
deleted file mode 100644
index e78662988f..0000000000
--- a/changelog.d/11482.misc
+++ /dev/null
@@ -1 +0,0 @@
-Save the OpenID Connect session ID on login.
diff --git a/changelog.d/11483.misc b/changelog.d/11483.misc
deleted file mode 100644
index 4cc47fcab9..0000000000
--- a/changelog.d/11483.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to `synapse.federation`.
diff --git a/changelog.d/11486.misc b/changelog.d/11486.misc
deleted file mode 100644
index 966f04d185..0000000000
--- a/changelog.d/11486.misc
+++ /dev/null
@@ -1 +0,0 @@
-Extend the `scripts-dev/sign_json` script to support signing events.
diff --git a/changelog.d/11488.misc b/changelog.d/11488.misc
deleted file mode 100644
index c14a7d2e98..0000000000
--- a/changelog.d/11488.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type annotations to `tests.storage.test_appservice`.
\ No newline at end of file
diff --git a/changelog.d/11490.feature b/changelog.d/11490.feature
deleted file mode 100644
index 4cb97dc1d0..0000000000
--- a/changelog.d/11490.feature
+++ /dev/null
@@ -1 +0,0 @@
-`synctl stop` will now wait for Synapse to exit before returning.
diff --git a/changelog.d/11492.misc b/changelog.d/11492.misc
deleted file mode 100644
index c14a7d2e98..0000000000
--- a/changelog.d/11492.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type annotations to `tests.storage.test_appservice`.
\ No newline at end of file
diff --git a/changelog.d/11493.misc b/changelog.d/11493.misc
deleted file mode 100644
index 646584a0d1..0000000000
--- a/changelog.d/11493.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up `tests.storage.test_main` to remove use of legacy code.
\ No newline at end of file
diff --git a/changelog.d/11494.misc b/changelog.d/11494.misc
deleted file mode 100644
index 52cf26a4b6..0000000000
--- a/changelog.d/11494.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor various parts of the `/sync` handler.
\ No newline at end of file
diff --git a/changelog.d/11495.misc b/changelog.d/11495.misc
deleted file mode 100644
index 5b52697fb4..0000000000
--- a/changelog.d/11495.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up `tests.test_visibility` to remove legacy code.
\ No newline at end of file
diff --git a/changelog.d/11497.misc b/changelog.d/11497.misc
deleted file mode 100644
index c4393f6193..0000000000
--- a/changelog.d/11497.misc
+++ /dev/null
@@ -1 +0,0 @@
-Preparation for database schema simplifications: disambiguate queries on `state_key`.
diff --git a/changelog.d/11501.misc b/changelog.d/11501.misc
deleted file mode 100644
index 40e01194df..0000000000
--- a/changelog.d/11501.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to `synapse/tests/rest/admin`.
\ No newline at end of file
diff --git a/changelog.d/11505.misc b/changelog.d/11505.misc
deleted file mode 100644
index 926b562fad..0000000000
--- a/changelog.d/11505.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common`.
diff --git a/changelog.d/11511.bugfix b/changelog.d/11511.bugfix
deleted file mode 100644
index 9c287357b8..0000000000
--- a/changelog.d/11511.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where invites from ignored users were included in incremental syncs.
\ No newline at end of file
diff --git a/changelog.d/11515.misc b/changelog.d/11515.misc
deleted file mode 100644
index 7f9d8cd57f..0000000000
--- a/changelog.d/11515.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor various parts of the `/sync` handler.
diff --git a/changelog.d/11518.bugfix b/changelog.d/11518.bugfix
deleted file mode 100644
index 3c27382c7a..0000000000
--- a/changelog.d/11518.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression in Synapse 1.48.0 where presence workers would not clear their presence updates over replication on shutdown.
diff --git a/changelog.d/11522.feature b/changelog.d/11522.feature
deleted file mode 100644
index 9e127fae3c..0000000000
--- a/changelog.d/11522.feature
+++ /dev/null
@@ -1 +0,0 @@
-Stabilise support for [MSC2918](https://github.com/matrix-org/matrix-doc/blob/main/proposals/2918-refreshtokens.md#msc2918-refresh-tokens) refresh tokens as they have now been merged into the Matrix specification.
\ No newline at end of file
diff --git a/changelog.d/11523.feature b/changelog.d/11523.feature
deleted file mode 100644
index ecac7f9db9..0000000000
--- a/changelog.d/11523.feature
+++ /dev/null
@@ -1 +0,0 @@
-Extend the "delete room" admin api to work correctly on rooms which have previously been partially deleted.
diff --git a/changelog.d/11524.bugfix b/changelog.d/11524.bugfix
deleted file mode 100644
index 6e1e4bd44c..0000000000
--- a/changelog.d/11524.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression in Synapse 1.48.0 where the module API's `looping_background_call` method would spam errors to the logs when given a non-async function.
diff --git a/changelog.d/11527.misc b/changelog.d/11527.misc
deleted file mode 100644
index 081eae317c..0000000000
--- a/changelog.d/11527.misc
+++ /dev/null
@@ -1 +0,0 @@
-Temporarily revert usage of `matrix-python-common`.
diff --git a/changelog.d/9445.feature b/changelog.d/9445.feature
deleted file mode 100644
index 6d12eea71f..0000000000
--- a/changelog.d/9445.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add [MSC3030](https://github.com/matrix-org/matrix-doc/pull/3030) experimental client and federation API endpoints to get the closest event to a given timestamp.
diff --git a/debian/changelog b/debian/changelog
index 7deab5936e..acc9f6049e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.49.0~rc1) stable; urgency=medium
+
+  * New synapse release 1.49.0~rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 07 Dec 2021 13:52:21 +0000
+
 matrix-synapse-py3 (1.48.0) stable; urgency=medium
 
   * New synapse release 1.48.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 3cd1ce6070..6369f18a53 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.48.0"
+__version__ = "1.49.0rc1"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when