From ec0e9c4695cbfb2180751c0b6c0453ed5c035e63 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 22 Oct 2020 13:08:42 +0100
Subject: [PATCH] 1.22.0rc1

---
 CHANGES.md               | 105 +++++++++++++++++++++++++++++++++++++++
 changelog.d/7658.feature |   1 -
 changelog.d/7921.docker  |   1 -
 changelog.d/8292.feature |   1 -
 changelog.d/8312.feature |   1 -
 changelog.d/8369.feature |   1 -
 changelog.d/8380.feature |   1 -
 changelog.d/8390.docker  |   1 -
 changelog.d/8407.misc    |   1 -
 changelog.d/8432.misc    |   1 -
 changelog.d/8433.misc    |   1 -
 changelog.d/8437.feature |   1 -
 changelog.d/8439.misc    |   1 -
 changelog.d/8443.misc    |   1 -
 changelog.d/8448.misc    |   1 -
 changelog.d/8450.misc    |   1 -
 changelog.d/8452.misc    |   1 -
 changelog.d/8454.bugfix  |   1 -
 changelog.d/8457.bugfix  |   1 -
 changelog.d/8458.feature |   1 -
 changelog.d/8461.feature |   1 -
 changelog.d/8462.doc     |   1 -
 changelog.d/8463.misc    |   1 -
 changelog.d/8464.misc    |   1 -
 changelog.d/8465.bugfix  |   1 -
 changelog.d/8467.feature |   1 -
 changelog.d/8468.misc    |   1 -
 changelog.d/8472.misc    |   1 -
 changelog.d/8474.misc    |   1 -
 changelog.d/8476.bugfix  |   1 -
 changelog.d/8477.misc    |   1 -
 changelog.d/8479.feature |   1 -
 changelog.d/8480.misc    |   1 -
 changelog.d/8486.bugfix  |   1 -
 changelog.d/8488.misc    |   1 -
 changelog.d/8489.feature |   1 -
 changelog.d/8492.misc    |   1 -
 changelog.d/8493.doc     |   1 -
 changelog.d/8494.misc    |   1 -
 changelog.d/8496.misc    |   1 -
 changelog.d/8497.misc    |   1 -
 changelog.d/8499.misc    |   1 -
 changelog.d/8501.feature |   1 -
 changelog.d/8502.feature |   1 -
 changelog.d/8503.misc    |   1 -
 changelog.d/8504.bugfix  |   1 -
 changelog.d/8505.misc    |   1 -
 changelog.d/8507.misc    |   1 -
 changelog.d/8513.feature |   1 -
 changelog.d/8514.misc    |   1 -
 changelog.d/8515.misc    |   1 -
 changelog.d/8517.bugfix  |   1 -
 changelog.d/8526.doc     |   1 -
 changelog.d/8527.bugfix  |   1 -
 changelog.d/8529.doc     |   1 -
 changelog.d/8535.feature |   1 -
 changelog.d/8536.bugfix  |   1 -
 changelog.d/8537.misc    |   1 -
 changelog.d/8542.misc    |   1 -
 changelog.d/8544.feature |   1 -
 changelog.d/8545.bugfix  |   1 -
 changelog.d/8547.misc    |   1 -
 changelog.d/8548.misc    |   1 -
 changelog.d/8561.misc    |   1 -
 changelog.d/8562.misc    |   1 -
 changelog.d/8563.misc    |   1 -
 changelog.d/8564.feature |   1 -
 changelog.d/8566.misc    |   1 -
 changelog.d/8567.bugfix  |   1 -
 changelog.d/8568.misc    |   1 -
 changelog.d/8569.misc    |   1 -
 changelog.d/8571.misc    |   1 -
 changelog.d/8572.misc    |   1 -
 changelog.d/8577.misc    |   1 -
 changelog.d/8578.misc    |   1 -
 changelog.d/8583.misc    |   1 -
 changelog.d/8585.bugfix  |   1 -
 changelog.d/8587.misc    |   1 -
 changelog.d/8589.removal |   1 -
 changelog.d/8590.misc    |   1 -
 changelog.d/8591.misc    |   1 -
 changelog.d/8592.misc    |   1 -
 changelog.d/8593.misc    |   1 -
 changelog.d/8594.misc    |   1 -
 changelog.d/8599.feature |   1 -
 changelog.d/8600.misc    |   1 -
 changelog.d/8606.feature |   1 -
 changelog.d/8609.misc    |   1 -
 synapse/__init__.py      |   2 +-
 89 files changed, 106 insertions(+), 88 deletions(-)
 delete mode 100644 changelog.d/7658.feature
 delete mode 100644 changelog.d/7921.docker
 delete mode 100644 changelog.d/8292.feature
 delete mode 100644 changelog.d/8312.feature
 delete mode 100644 changelog.d/8369.feature
 delete mode 100644 changelog.d/8380.feature
 delete mode 100644 changelog.d/8390.docker
 delete mode 100644 changelog.d/8407.misc
 delete mode 100644 changelog.d/8432.misc
 delete mode 100644 changelog.d/8433.misc
 delete mode 100644 changelog.d/8437.feature
 delete mode 100644 changelog.d/8439.misc
 delete mode 100644 changelog.d/8443.misc
 delete mode 100644 changelog.d/8448.misc
 delete mode 100644 changelog.d/8450.misc
 delete mode 100644 changelog.d/8452.misc
 delete mode 100644 changelog.d/8454.bugfix
 delete mode 100644 changelog.d/8457.bugfix
 delete mode 100644 changelog.d/8458.feature
 delete mode 100644 changelog.d/8461.feature
 delete mode 100644 changelog.d/8462.doc
 delete mode 100644 changelog.d/8463.misc
 delete mode 100644 changelog.d/8464.misc
 delete mode 100644 changelog.d/8465.bugfix
 delete mode 100644 changelog.d/8467.feature
 delete mode 100644 changelog.d/8468.misc
 delete mode 100644 changelog.d/8472.misc
 delete mode 100644 changelog.d/8474.misc
 delete mode 100644 changelog.d/8476.bugfix
 delete mode 100644 changelog.d/8477.misc
 delete mode 100644 changelog.d/8479.feature
 delete mode 100644 changelog.d/8480.misc
 delete mode 100644 changelog.d/8486.bugfix
 delete mode 100644 changelog.d/8488.misc
 delete mode 100644 changelog.d/8489.feature
 delete mode 100644 changelog.d/8492.misc
 delete mode 100644 changelog.d/8493.doc
 delete mode 100644 changelog.d/8494.misc
 delete mode 100644 changelog.d/8496.misc
 delete mode 100644 changelog.d/8497.misc
 delete mode 100644 changelog.d/8499.misc
 delete mode 100644 changelog.d/8501.feature
 delete mode 100644 changelog.d/8502.feature
 delete mode 100644 changelog.d/8503.misc
 delete mode 100644 changelog.d/8504.bugfix
 delete mode 100644 changelog.d/8505.misc
 delete mode 100644 changelog.d/8507.misc
 delete mode 100644 changelog.d/8513.feature
 delete mode 100644 changelog.d/8514.misc
 delete mode 100644 changelog.d/8515.misc
 delete mode 100644 changelog.d/8517.bugfix
 delete mode 100644 changelog.d/8526.doc
 delete mode 100644 changelog.d/8527.bugfix
 delete mode 100644 changelog.d/8529.doc
 delete mode 100644 changelog.d/8535.feature
 delete mode 100644 changelog.d/8536.bugfix
 delete mode 100644 changelog.d/8537.misc
 delete mode 100644 changelog.d/8542.misc
 delete mode 100644 changelog.d/8544.feature
 delete mode 100644 changelog.d/8545.bugfix
 delete mode 100644 changelog.d/8547.misc
 delete mode 100644 changelog.d/8548.misc
 delete mode 100644 changelog.d/8561.misc
 delete mode 100644 changelog.d/8562.misc
 delete mode 100644 changelog.d/8563.misc
 delete mode 100644 changelog.d/8564.feature
 delete mode 100644 changelog.d/8566.misc
 delete mode 100644 changelog.d/8567.bugfix
 delete mode 100644 changelog.d/8568.misc
 delete mode 100644 changelog.d/8569.misc
 delete mode 100644 changelog.d/8571.misc
 delete mode 100644 changelog.d/8572.misc
 delete mode 100644 changelog.d/8577.misc
 delete mode 100644 changelog.d/8578.misc
 delete mode 100644 changelog.d/8583.misc
 delete mode 100644 changelog.d/8585.bugfix
 delete mode 100644 changelog.d/8587.misc
 delete mode 100644 changelog.d/8589.removal
 delete mode 100644 changelog.d/8590.misc
 delete mode 100644 changelog.d/8591.misc
 delete mode 100644 changelog.d/8592.misc
 delete mode 100644 changelog.d/8593.misc
 delete mode 100644 changelog.d/8594.misc
 delete mode 100644 changelog.d/8599.feature
 delete mode 100644 changelog.d/8600.misc
 delete mode 100644 changelog.d/8606.feature
 delete mode 100644 changelog.d/8609.misc

diff --git a/CHANGES.md b/CHANGES.md
index 38a0814bb..2015680bc 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,108 @@
+Synapse 1.22.0rc1 (2020-10-22)
+==============================
+
+Features
+--------
+
+- Add a configuration option for always using the "userinfo endpoint" for OpenID Connect. This fixes support for some identity providers, e.g. GitLab. Contributed by Benjamin Koch. ([\#7658](https://github.com/matrix-org/synapse/issues/7658))
+- Allow `ThirdPartyEventRules` modules to query and manipulate whether a room is in the public rooms directory. ([\#8292](https://github.com/matrix-org/synapse/issues/8292), [\#8467](https://github.com/matrix-org/synapse/issues/8467))
+- Add support for olm fallback keys ([MSC2732](https://github.com/matrix-org/matrix-doc/pull/2732)). ([\#8312](https://github.com/matrix-org/synapse/issues/8312), [\#8501](https://github.com/matrix-org/synapse/issues/8501))
+- Allow running background tasks in a separate worker process. ([\#8369](https://github.com/matrix-org/synapse/issues/8369), [\#8458](https://github.com/matrix-org/synapse/issues/8458), [\#8489](https://github.com/matrix-org/synapse/issues/8489), [\#8513](https://github.com/matrix-org/synapse/issues/8513), [\#8544](https://github.com/matrix-org/synapse/issues/8544), [\#8599](https://github.com/matrix-org/synapse/issues/8599))
+- Add support for device dehydration ([MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697)). ([\#8380](https://github.com/matrix-org/synapse/issues/8380))
+- Implement [MSC2409](https://github.com/matrix-org/matrix-doc/pull/2409) to send typing, read receipts, and presence events to appservices. ([\#8437](https://github.com/matrix-org/synapse/issues/8437))
+- Change default room version to "6", per [MSC2788](https://github.com/matrix-org/matrix-doc/pull/2788). ([\#8461](https://github.com/matrix-org/synapse/issues/8461))
+- Add the ability to send non-membership events into a room via the `ModuleApi`. ([\#8479](https://github.com/matrix-org/synapse/issues/8479))
+- Increase default upload size limit from 10M to 50M. Contributed by @Akkowicz. ([\#8502](https://github.com/matrix-org/synapse/issues/8502))
+- Support modifying event content in `ThirdPartyRules` modules. ([\#8535](https://github.com/matrix-org/synapse/issues/8535), [\#8564](https://github.com/matrix-org/synapse/issues/8564))
+- Limit appservice transactions to 100 persistent and 100 ephemeral events. ([\#8606](https://github.com/matrix-org/synapse/issues/8606))
+
+
+Bugfixes
+--------
+
+- Fix a longstanding bug where invalid ignored users in account data could break clients. ([\#8454](https://github.com/matrix-org/synapse/issues/8454))
+- Fix a bug where backfilling a room with an event that was missing the `redacts` field would break. ([\#8457](https://github.com/matrix-org/synapse/issues/8457))
+- Don't attempt to respond to some requests if the client has already disconnected. ([\#8465](https://github.com/matrix-org/synapse/issues/8465))
+- Fix message duplication if something goes wrong after persisting the event. ([\#8476](https://github.com/matrix-org/synapse/issues/8476))
+- Fix incremental sync returning an incorrect `prev_batch` token in timeline section, which when used to paginate returned events that were included in the incremental sync. Broken since v0.16.0. ([\#8486](https://github.com/matrix-org/synapse/issues/8486))
+- Expose the `uk.half-shot.msc2778.login.application_service` to clients from the login API. This feature was added in v1.21.0, but was not exposed as a potential login flow. ([\#8504](https://github.com/matrix-org/synapse/issues/8504))
+- Fix error code for `/profile/{userId}/displayname` to be `M_BAD_JSON`. ([\#8517](https://github.com/matrix-org/synapse/issues/8517))
+- Fix a bug introduced in v1.7.0 that could cause Synapse to insert values from non-state `m.room.retention` events into the `room_retention` database table. ([\#8527](https://github.com/matrix-org/synapse/issues/8527))
+- Fix not sending events over federation when using sharded event writers. ([\#8536](https://github.com/matrix-org/synapse/issues/8536))
+- Fix a long standing bug where email notifications for encrypted messages were blank. ([\#8545](https://github.com/matrix-org/synapse/issues/8545))
+- Fix increase in the number of `There was no active span...` errors logged when using OpenTracing. ([\#8567](https://github.com/matrix-org/synapse/issues/8567))
+- Fix a bug that prevented errors encountered during execution of the `synapse_port_db` from being correctly printed. ([\#8585](https://github.com/matrix-org/synapse/issues/8585))
+
+
+Updates to the Docker image
+---------------------------
+
+- Added multi-arch support (arm64,arm/v7) for the docker images. Contributed by @maquis196. ([\#7921](https://github.com/matrix-org/synapse/issues/7921))
+- Add support for passing commandline args to the synapse process. Contributed by @samuel-p. ([\#8390](https://github.com/matrix-org/synapse/issues/8390))
+
+
+Improved Documentation
+----------------------
+
+- Update the directions for using the manhole with coroutines. ([\#8462](https://github.com/matrix-org/synapse/issues/8462))
+- Improve readme by adding new shield.io badges. ([\#8493](https://github.com/matrix-org/synapse/issues/8493))
+- Added note about docker in manhole.md regarding which ip address to bind to. Contributed by @Maquis196. ([\#8526](https://github.com/matrix-org/synapse/issues/8526))
+- Document the new behaviour of the `allowed_lifetime_min` and `allowed_lifetime_max` settings in the room retention configuration. ([\#8529](https://github.com/matrix-org/synapse/issues/8529))
+
+
+Deprecations and Removals
+-------------------------
+
+- Drop unused `device_max_stream_id` table. ([\#8589](https://github.com/matrix-org/synapse/issues/8589))
+
+
+Internal Changes
+----------------
+
+- Add typing information to the device handler. ([\#8407](https://github.com/matrix-org/synapse/issues/8407))
+- Check for unreachable code with mypy. ([\#8432](https://github.com/matrix-org/synapse/issues/8432))
+- Add unit test for event persister sharding. ([\#8433](https://github.com/matrix-org/synapse/issues/8433))
+- Allow events to be sent to clients sooner when using sharded event persisters. ([\#8439](https://github.com/matrix-org/synapse/issues/8439), [\#8488](https://github.com/matrix-org/synapse/issues/8488), [\#8496](https://github.com/matrix-org/synapse/issues/8496), [\#8499](https://github.com/matrix-org/synapse/issues/8499))
+- Configure `public_baseurl` when using demo scripts. ([\#8443](https://github.com/matrix-org/synapse/issues/8443))
+- Add SQL logging on queries that happen during startup. ([\#8448](https://github.com/matrix-org/synapse/issues/8448))
+- Speed up unit tests when using PostgreSQL. ([\#8450](https://github.com/matrix-org/synapse/issues/8450))
+- Remove redundant databae loads of stream_ordering for events we already have. ([\#8452](https://github.com/matrix-org/synapse/issues/8452))
+- Reduce inconsistencies between codepaths for membership and non-membership events. ([\#8463](https://github.com/matrix-org/synapse/issues/8463))
+- Combine `SpamCheckerApi` with the more generic `ModuleApi`. ([\#8464](https://github.com/matrix-org/synapse/issues/8464))
+- Additional testing for `ThirdPartyEventRules`. ([\#8468](https://github.com/matrix-org/synapse/issues/8468))
+- Add `-d` option to `./scripts-dev/lint.sh` to lint files that have changed since the last git commit. ([\#8472](https://github.com/matrix-org/synapse/issues/8472))
+- Unblacklist some sytests. ([\#8474](https://github.com/matrix-org/synapse/issues/8474))
+- Include the log level in the phone home stats. ([\#8477](https://github.com/matrix-org/synapse/issues/8477))
+- Remove outdated sphinx documentation, scripts and configuration. ([\#8480](https://github.com/matrix-org/synapse/issues/8480))
+- Clarify error message when plugin config parsers raise an error. ([\#8492](https://github.com/matrix-org/synapse/issues/8492))
+- Remove the deprecated `Handlers` object. ([\#8494](https://github.com/matrix-org/synapse/issues/8494))
+- Fix a threadsafety bug in unit tests. ([\#8497](https://github.com/matrix-org/synapse/issues/8497))
+- Add user agent to user_daily_visits table. ([\#8503](https://github.com/matrix-org/synapse/issues/8503))
+- Add type hints to various parts of the code base. ([\#8505](https://github.com/matrix-org/synapse/issues/8505), [\#8507](https://github.com/matrix-org/synapse/issues/8507))
+- Remove unused code from the test framework. ([\#8514](https://github.com/matrix-org/synapse/issues/8514))
+- Apply some internal fixes to the `HomeServer` class to make its code more idiomatic and statically-verifiable. ([\#8515](https://github.com/matrix-org/synapse/issues/8515))
+- Factor out common code between `RoomMemberHandler._locally_reject_invite` and `EventCreationHandler.create_event`. ([\#8537](https://github.com/matrix-org/synapse/issues/8537))
+- Improve database performance by executing more queries without starting transactions. ([\#8542](https://github.com/matrix-org/synapse/issues/8542))
+- Enable mypy type checking for `synapse.util.caches`. ([\#8547](https://github.com/matrix-org/synapse/issues/8547))
+- Rename `Cache` to `DeferredCache`, to better reflect its purpose. ([\#8548](https://github.com/matrix-org/synapse/issues/8548))
+- Move metric registration code down into `LruCache`. ([\#8561](https://github.com/matrix-org/synapse/issues/8561), [\#8591](https://github.com/matrix-org/synapse/issues/8591))
+- Add type annotations for `LruCache`. ([\#8562](https://github.com/matrix-org/synapse/issues/8562))
+- Replace `DeferredCache` with the lighter-weight `LruCache` where possible. ([\#8563](https://github.com/matrix-org/synapse/issues/8563))
+- Add virtualenv-generated folders to `.gitignore`. ([\#8566](https://github.com/matrix-org/synapse/issues/8566))
+- Add `get_immediate` method to `DeferredCache`. ([\#8568](https://github.com/matrix-org/synapse/issues/8568))
+- Fix mypy not properly checking across the codebase, additionally, fix a typing assertion error in `handlers/auth.py`. ([\#8569](https://github.com/matrix-org/synapse/issues/8569))
+- Fix `synmark` benchmark runner. ([\#8571](https://github.com/matrix-org/synapse/issues/8571))
+- Modify `DeferredCache.get()` to return `Deferred`s instead of `ObservableDeferred`s. ([\#8572](https://github.com/matrix-org/synapse/issues/8572))
+- Adjust a protocol-type definition to fit `sqlite3` assertions. ([\#8577](https://github.com/matrix-org/synapse/issues/8577))
+- Support macOS on the `synmark` benchmark runner. ([\#8578](https://github.com/matrix-org/synapse/issues/8578))
+- Update `mypy` static type checker to 0.790. ([\#8583](https://github.com/matrix-org/synapse/issues/8583), [\#8600](https://github.com/matrix-org/synapse/issues/8600))
+- Re-organize the structured logging code to separate the TCP transport handling from the JSON formatting. ([\#8587](https://github.com/matrix-org/synapse/issues/8587))
+- Implement [MSC2409](https://github.com/matrix-org/matrix-doc/pull/2409) to send typing, read receipts, and presence events to appservices. ([\#8590](https://github.com/matrix-org/synapse/issues/8590))
+- Remove extraneous unittest logging decorators from unit tests. ([\#8592](https://github.com/matrix-org/synapse/issues/8592))
+- Minor optimisations in caching code. ([\#8593](https://github.com/matrix-org/synapse/issues/8593), [\#8594](https://github.com/matrix-org/synapse/issues/8594))
+- Add type hints to profile and base handler. ([\#8609](https://github.com/matrix-org/synapse/issues/8609))
+
+
 Synapse 1.21.2 (2020-10-15)
 ===========================
 
diff --git a/changelog.d/7658.feature b/changelog.d/7658.feature
deleted file mode 100644
index fbf345988..000000000
--- a/changelog.d/7658.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add a configuration option for always using the "userinfo endpoint" for OpenID Connect. This fixes support for some identity providers, e.g. GitLab. Contributed by Benjamin Koch.
diff --git a/changelog.d/7921.docker b/changelog.d/7921.docker
deleted file mode 100644
index 7cecd67c6..000000000
--- a/changelog.d/7921.docker
+++ /dev/null
@@ -1 +0,0 @@
-Added multi-arch support (arm64,arm/v7) for the docker images. Contributed by @maquis196.
diff --git a/changelog.d/8292.feature b/changelog.d/8292.feature
deleted file mode 100644
index 6d0335e2c..000000000
--- a/changelog.d/8292.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow `ThirdPartyEventRules` modules to query and manipulate whether a room is in the public rooms directory.
\ No newline at end of file
diff --git a/changelog.d/8312.feature b/changelog.d/8312.feature
deleted file mode 100644
index 222a1b032..000000000
--- a/changelog.d/8312.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for olm fallback keys ([MSC2732](https://github.com/matrix-org/matrix-doc/pull/2732)).
\ No newline at end of file
diff --git a/changelog.d/8369.feature b/changelog.d/8369.feature
deleted file mode 100644
index 542993110..000000000
--- a/changelog.d/8369.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow running background tasks in a separate worker process.
diff --git a/changelog.d/8380.feature b/changelog.d/8380.feature
deleted file mode 100644
index 05ccea19d..000000000
--- a/changelog.d/8380.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for device dehydration ([MSC2697](https://github.com/matrix-org/matrix-doc/pull/2697)).
diff --git a/changelog.d/8390.docker b/changelog.d/8390.docker
deleted file mode 100644
index f71b8e4bb..000000000
--- a/changelog.d/8390.docker
+++ /dev/null
@@ -1 +0,0 @@
-Add support for passing commandline args to the synapse process. Contributed by @samuel-p.
diff --git a/changelog.d/8407.misc b/changelog.d/8407.misc
deleted file mode 100644
index d37002d75..000000000
--- a/changelog.d/8407.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add typing information to the device handler.
diff --git a/changelog.d/8432.misc b/changelog.d/8432.misc
deleted file mode 100644
index 01fdad4ca..000000000
--- a/changelog.d/8432.misc
+++ /dev/null
@@ -1 +0,0 @@
-Check for unreachable code with mypy.
diff --git a/changelog.d/8433.misc b/changelog.d/8433.misc
deleted file mode 100644
index 05f8b5bbf..000000000
--- a/changelog.d/8433.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add unit test for event persister sharding.
diff --git a/changelog.d/8437.feature b/changelog.d/8437.feature
deleted file mode 100644
index 4abcccb32..000000000
--- a/changelog.d/8437.feature
+++ /dev/null
@@ -1 +0,0 @@
-Implement [MSC2409](https://github.com/matrix-org/matrix-doc/pull/2409) to send typing, read receipts, and presence events to appservices.
diff --git a/changelog.d/8439.misc b/changelog.d/8439.misc
deleted file mode 100644
index 237cb3b31..000000000
--- a/changelog.d/8439.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow events to be sent to clients sooner when using sharded event persisters.
diff --git a/changelog.d/8443.misc b/changelog.d/8443.misc
deleted file mode 100644
index 633598e6b..000000000
--- a/changelog.d/8443.misc
+++ /dev/null
@@ -1 +0,0 @@
-Configure `public_baseurl` when using demo scripts.
diff --git a/changelog.d/8448.misc b/changelog.d/8448.misc
deleted file mode 100644
index 5ddda1803..000000000
--- a/changelog.d/8448.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add SQL logging on queries that happen during startup.
diff --git a/changelog.d/8450.misc b/changelog.d/8450.misc
deleted file mode 100644
index 4e04c523a..000000000
--- a/changelog.d/8450.misc
+++ /dev/null
@@ -1 +0,0 @@
-Speed up unit tests when using PostgreSQL.
diff --git a/changelog.d/8452.misc b/changelog.d/8452.misc
deleted file mode 100644
index 8288d91c7..000000000
--- a/changelog.d/8452.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant databae loads of stream_ordering for events we already have.
diff --git a/changelog.d/8454.bugfix b/changelog.d/8454.bugfix
deleted file mode 100644
index c06d490b6..000000000
--- a/changelog.d/8454.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a longstanding bug where invalid ignored users in account data could break clients.
diff --git a/changelog.d/8457.bugfix b/changelog.d/8457.bugfix
deleted file mode 100644
index 545b06d18..000000000
--- a/changelog.d/8457.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where backfilling a room with an event that was missing the `redacts` field would break.
diff --git a/changelog.d/8458.feature b/changelog.d/8458.feature
deleted file mode 100644
index 542993110..000000000
--- a/changelog.d/8458.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow running background tasks in a separate worker process.
diff --git a/changelog.d/8461.feature b/changelog.d/8461.feature
deleted file mode 100644
index 3665d670e..000000000
--- a/changelog.d/8461.feature
+++ /dev/null
@@ -1 +0,0 @@
-Change default room version to "6", per [MSC2788](https://github.com/matrix-org/matrix-doc/pull/2788).
diff --git a/changelog.d/8462.doc b/changelog.d/8462.doc
deleted file mode 100644
index cf84db6db..000000000
--- a/changelog.d/8462.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the directions for using the manhole with coroutines.
diff --git a/changelog.d/8463.misc b/changelog.d/8463.misc
deleted file mode 100644
index 040c9bb90..000000000
--- a/changelog.d/8463.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce inconsistencies between codepaths for membership and non-membership events.
diff --git a/changelog.d/8464.misc b/changelog.d/8464.misc
deleted file mode 100644
index a552e88f9..000000000
--- a/changelog.d/8464.misc
+++ /dev/null
@@ -1 +0,0 @@
-Combine `SpamCheckerApi` with the more generic `ModuleApi`.
diff --git a/changelog.d/8465.bugfix b/changelog.d/8465.bugfix
deleted file mode 100644
index 73f895b26..000000000
--- a/changelog.d/8465.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Don't attempt to respond to some requests if the client has already disconnected.
\ No newline at end of file
diff --git a/changelog.d/8467.feature b/changelog.d/8467.feature
deleted file mode 100644
index 6d0335e2c..000000000
--- a/changelog.d/8467.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow `ThirdPartyEventRules` modules to query and manipulate whether a room is in the public rooms directory.
\ No newline at end of file
diff --git a/changelog.d/8468.misc b/changelog.d/8468.misc
deleted file mode 100644
index 32ba991e6..000000000
--- a/changelog.d/8468.misc
+++ /dev/null
@@ -1 +0,0 @@
-Additional testing for `ThirdPartyEventRules`.
diff --git a/changelog.d/8472.misc b/changelog.d/8472.misc
deleted file mode 100644
index 880f3f5e1..000000000
--- a/changelog.d/8472.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `-d` option to `./scripts-dev/lint.sh` to lint files that have changed since the last git commit.
\ No newline at end of file
diff --git a/changelog.d/8474.misc b/changelog.d/8474.misc
deleted file mode 100644
index 65e329a6e..000000000
--- a/changelog.d/8474.misc
+++ /dev/null
@@ -1 +0,0 @@
-Unblacklist some sytests.
diff --git a/changelog.d/8476.bugfix b/changelog.d/8476.bugfix
deleted file mode 100644
index 993a26997..000000000
--- a/changelog.d/8476.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix message duplication if something goes wrong after persisting the event.
diff --git a/changelog.d/8477.misc b/changelog.d/8477.misc
deleted file mode 100644
index 2ee1606b6..000000000
--- a/changelog.d/8477.misc
+++ /dev/null
@@ -1 +0,0 @@
-Include the log level in the phone home stats.
diff --git a/changelog.d/8479.feature b/changelog.d/8479.feature
deleted file mode 100644
index 11adeec8a..000000000
--- a/changelog.d/8479.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add the ability to send non-membership events into a room via the `ModuleApi`.
\ No newline at end of file
diff --git a/changelog.d/8480.misc b/changelog.d/8480.misc
deleted file mode 100644
index 81633af29..000000000
--- a/changelog.d/8480.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove outdated sphinx documentation, scripts and configuration.
\ No newline at end of file
diff --git a/changelog.d/8486.bugfix b/changelog.d/8486.bugfix
deleted file mode 100644
index 63fc091ba..000000000
--- a/changelog.d/8486.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix incremental sync returning an incorrect `prev_batch` token in timeline section, which when used to paginate returned events that were included in the incremental sync. Broken since v0.16.0.
diff --git a/changelog.d/8488.misc b/changelog.d/8488.misc
deleted file mode 100644
index 237cb3b31..000000000
--- a/changelog.d/8488.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow events to be sent to clients sooner when using sharded event persisters.
diff --git a/changelog.d/8489.feature b/changelog.d/8489.feature
deleted file mode 100644
index 22591870a..000000000
--- a/changelog.d/8489.feature
+++ /dev/null
@@ -1 +0,0 @@
- Allow running background tasks in a separate worker process.
diff --git a/changelog.d/8492.misc b/changelog.d/8492.misc
deleted file mode 100644
index a344aee79..000000000
--- a/changelog.d/8492.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify error message when plugin config parsers raise an error.
diff --git a/changelog.d/8493.doc b/changelog.d/8493.doc
deleted file mode 100644
index 26797cd99..000000000
--- a/changelog.d/8493.doc
+++ /dev/null
@@ -1 +0,0 @@
-Improve readme by adding new shield.io badges.
diff --git a/changelog.d/8494.misc b/changelog.d/8494.misc
deleted file mode 100644
index 6e56c6b85..000000000
--- a/changelog.d/8494.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove the deprecated `Handlers` object.
diff --git a/changelog.d/8496.misc b/changelog.d/8496.misc
deleted file mode 100644
index 237cb3b31..000000000
--- a/changelog.d/8496.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow events to be sent to clients sooner when using sharded event persisters.
diff --git a/changelog.d/8497.misc b/changelog.d/8497.misc
deleted file mode 100644
index 8bc05e8df..000000000
--- a/changelog.d/8497.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix a threadsafety bug in unit tests.
diff --git a/changelog.d/8499.misc b/changelog.d/8499.misc
deleted file mode 100644
index 237cb3b31..000000000
--- a/changelog.d/8499.misc
+++ /dev/null
@@ -1 +0,0 @@
-Allow events to be sent to clients sooner when using sharded event persisters.
diff --git a/changelog.d/8501.feature b/changelog.d/8501.feature
deleted file mode 100644
index 5220ddd48..000000000
--- a/changelog.d/8501.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add support for olm fallback keys ([MSC2732](https://github.com/matrix-org/matrix-doc/pull/2732)).
diff --git a/changelog.d/8502.feature b/changelog.d/8502.feature
deleted file mode 100644
index faab8d304..000000000
--- a/changelog.d/8502.feature
+++ /dev/null
@@ -1 +0,0 @@
-Increase default upload size limit from 10M to 50M. Contributed by @Akkowicz.
diff --git a/changelog.d/8503.misc b/changelog.d/8503.misc
deleted file mode 100644
index edb1be8aa..000000000
--- a/changelog.d/8503.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add user agent to user_daily_visits table.
diff --git a/changelog.d/8504.bugfix b/changelog.d/8504.bugfix
deleted file mode 100644
index 2bd0dbb8b..000000000
--- a/changelog.d/8504.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Expose the `uk.half-shot.msc2778.login.application_service` to clients from the login API. This feature was added in v1.21.0, but was not exposed as a potential login flow.
diff --git a/changelog.d/8505.misc b/changelog.d/8505.misc
deleted file mode 100644
index 5aa5c113b..000000000
--- a/changelog.d/8505.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to various parts of the code base.
diff --git a/changelog.d/8507.misc b/changelog.d/8507.misc
deleted file mode 100644
index 724da8a99..000000000
--- a/changelog.d/8507.misc
+++ /dev/null
@@ -1 +0,0 @@
- Add type hints to various parts of the code base.
diff --git a/changelog.d/8513.feature b/changelog.d/8513.feature
deleted file mode 100644
index 542993110..000000000
--- a/changelog.d/8513.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow running background tasks in a separate worker process.
diff --git a/changelog.d/8514.misc b/changelog.d/8514.misc
deleted file mode 100644
index 0e7ac4f22..000000000
--- a/changelog.d/8514.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove unused code from the test framework.
diff --git a/changelog.d/8515.misc b/changelog.d/8515.misc
deleted file mode 100644
index 1f8aa292d..000000000
--- a/changelog.d/8515.misc
+++ /dev/null
@@ -1 +0,0 @@
-Apply some internal fixes to the `HomeServer` class to make its code more idiomatic and statically-verifiable.
diff --git a/changelog.d/8517.bugfix b/changelog.d/8517.bugfix
deleted file mode 100644
index 1ab623c59..000000000
--- a/changelog.d/8517.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix error code for `/profile/{userId}/displayname` to be `M_BAD_JSON`.
diff --git a/changelog.d/8526.doc b/changelog.d/8526.doc
deleted file mode 100644
index cbf48680c..000000000
--- a/changelog.d/8526.doc
+++ /dev/null
@@ -1 +0,0 @@
-Added note about docker in manhole.md regarding which ip address to bind to. Contributed by @Maquis196.
diff --git a/changelog.d/8527.bugfix b/changelog.d/8527.bugfix
deleted file mode 100644
index 727e0ba29..000000000
--- a/changelog.d/8527.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug introduced in v1.7.0 that could cause Synapse to insert values from non-state `m.room.retention` events into the `room_retention` database table.
diff --git a/changelog.d/8529.doc b/changelog.d/8529.doc
deleted file mode 100644
index 6e710e652..000000000
--- a/changelog.d/8529.doc
+++ /dev/null
@@ -1 +0,0 @@
-Document the new behaviour of the `allowed_lifetime_min` and `allowed_lifetime_max` settings in the room retention configuration.
diff --git a/changelog.d/8535.feature b/changelog.d/8535.feature
deleted file mode 100644
index 45342e66a..000000000
--- a/changelog.d/8535.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support modifying event content in `ThirdPartyRules` modules.
diff --git a/changelog.d/8536.bugfix b/changelog.d/8536.bugfix
deleted file mode 100644
index 8d238cc00..000000000
--- a/changelog.d/8536.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix not sending events over federation when using sharded event writers.
diff --git a/changelog.d/8537.misc b/changelog.d/8537.misc
deleted file mode 100644
index 26309b5b9..000000000
--- a/changelog.d/8537.misc
+++ /dev/null
@@ -1 +0,0 @@
-Factor out common code between `RoomMemberHandler._locally_reject_invite` and `EventCreationHandler.create_event`.
diff --git a/changelog.d/8542.misc b/changelog.d/8542.misc
deleted file mode 100644
index 63149fd9b..000000000
--- a/changelog.d/8542.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve database performance by executing more queries without starting transactions.
diff --git a/changelog.d/8544.feature b/changelog.d/8544.feature
deleted file mode 100644
index 542993110..000000000
--- a/changelog.d/8544.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow running background tasks in a separate worker process.
diff --git a/changelog.d/8545.bugfix b/changelog.d/8545.bugfix
deleted file mode 100644
index 64ba307df..000000000
--- a/changelog.d/8545.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long standing bug where email notifications for encrypted messages were blank.
diff --git a/changelog.d/8547.misc b/changelog.d/8547.misc
deleted file mode 100644
index fafb1c834..000000000
--- a/changelog.d/8547.misc
+++ /dev/null
@@ -1 +0,0 @@
-Enable mypy type checking for `synapse.util.caches`.
diff --git a/changelog.d/8548.misc b/changelog.d/8548.misc
deleted file mode 100644
index fba10bd73..000000000
--- a/changelog.d/8548.misc
+++ /dev/null
@@ -1 +0,0 @@
-Rename `Cache` to `DeferredCache`, to better reflect its purpose.
diff --git a/changelog.d/8561.misc b/changelog.d/8561.misc
deleted file mode 100644
index a40dedfa8..000000000
--- a/changelog.d/8561.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move metric registration code down into `LruCache`.
diff --git a/changelog.d/8562.misc b/changelog.d/8562.misc
deleted file mode 100644
index ebdbddb50..000000000
--- a/changelog.d/8562.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type annotations for `LruCache`.
diff --git a/changelog.d/8563.misc b/changelog.d/8563.misc
deleted file mode 100644
index eeba8e5fe..000000000
--- a/changelog.d/8563.misc
+++ /dev/null
@@ -1 +0,0 @@
-Replace `DeferredCache` with the lighter-weight `LruCache` where possible.
diff --git a/changelog.d/8564.feature b/changelog.d/8564.feature
deleted file mode 100644
index 45342e66a..000000000
--- a/changelog.d/8564.feature
+++ /dev/null
@@ -1 +0,0 @@
-Support modifying event content in `ThirdPartyRules` modules.
diff --git a/changelog.d/8566.misc b/changelog.d/8566.misc
deleted file mode 100644
index 453cf48ff..000000000
--- a/changelog.d/8566.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add virtualenv-generated folders to `.gitignore`.
\ No newline at end of file
diff --git a/changelog.d/8567.bugfix b/changelog.d/8567.bugfix
deleted file mode 100644
index 4d835df6f..000000000
--- a/changelog.d/8567.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix increase in the number of `There was no active span...` errors logged when using OpenTracing.
diff --git a/changelog.d/8568.misc b/changelog.d/8568.misc
deleted file mode 100644
index 0ed7db92d..000000000
--- a/changelog.d/8568.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add `get_immediate` method to `DeferredCache`.
diff --git a/changelog.d/8569.misc b/changelog.d/8569.misc
deleted file mode 100644
index 3b6e0625e..000000000
--- a/changelog.d/8569.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix mypy not properly checking across the codebase, additionally, fix a typing assertion error in `handlers/auth.py`.
\ No newline at end of file
diff --git a/changelog.d/8571.misc b/changelog.d/8571.misc
deleted file mode 100644
index f6a65057e..000000000
--- a/changelog.d/8571.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix `synmark` benchmark runner.
diff --git a/changelog.d/8572.misc b/changelog.d/8572.misc
deleted file mode 100644
index ea2a6d340..000000000
--- a/changelog.d/8572.misc
+++ /dev/null
@@ -1 +0,0 @@
-Modify `DeferredCache.get()` to return `Deferred`s instead of `ObservableDeferred`s.
diff --git a/changelog.d/8577.misc b/changelog.d/8577.misc
deleted file mode 100644
index 75fe563a0..000000000
--- a/changelog.d/8577.misc
+++ /dev/null
@@ -1 +0,0 @@
-Adjust a protocol-type definition to fit `sqlite3` assertions.
\ No newline at end of file
diff --git a/changelog.d/8578.misc b/changelog.d/8578.misc
deleted file mode 100644
index e93462255..000000000
--- a/changelog.d/8578.misc
+++ /dev/null
@@ -1 +0,0 @@
-Support macOS on the `synmark` benchmark runner.
diff --git a/changelog.d/8583.misc b/changelog.d/8583.misc
deleted file mode 100644
index d24973f09..000000000
--- a/changelog.d/8583.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update `mypy` static type checker to 0.790.
\ No newline at end of file
diff --git a/changelog.d/8585.bugfix b/changelog.d/8585.bugfix
deleted file mode 100644
index e97e6ac1d..000000000
--- a/changelog.d/8585.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug that prevented errors encountered during execution of the `synapse_port_db` from being correctly printed.
\ No newline at end of file
diff --git a/changelog.d/8587.misc b/changelog.d/8587.misc
deleted file mode 100644
index 9e56551a3..000000000
--- a/changelog.d/8587.misc
+++ /dev/null
@@ -1 +0,0 @@
-Re-organize the structured logging code to separate the TCP transport handling from the JSON formatting.
diff --git a/changelog.d/8589.removal b/changelog.d/8589.removal
deleted file mode 100644
index b80f29d6b..000000000
--- a/changelog.d/8589.removal
+++ /dev/null
@@ -1 +0,0 @@
-Drop unused `device_max_stream_id` table.
diff --git a/changelog.d/8590.misc b/changelog.d/8590.misc
deleted file mode 100644
index 4abcccb32..000000000
--- a/changelog.d/8590.misc
+++ /dev/null
@@ -1 +0,0 @@
-Implement [MSC2409](https://github.com/matrix-org/matrix-doc/pull/2409) to send typing, read receipts, and presence events to appservices.
diff --git a/changelog.d/8591.misc b/changelog.d/8591.misc
deleted file mode 100644
index 8f16bc3e7..000000000
--- a/changelog.d/8591.misc
+++ /dev/null
@@ -1 +0,0 @@
- Move metric registration code down into `LruCache`.
diff --git a/changelog.d/8592.misc b/changelog.d/8592.misc
deleted file mode 100644
index 099e8fb7b..000000000
--- a/changelog.d/8592.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove extraneous unittest logging decorators from unit tests.
\ No newline at end of file
diff --git a/changelog.d/8593.misc b/changelog.d/8593.misc
deleted file mode 100644
index d266ba19a..000000000
--- a/changelog.d/8593.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor optimisations in caching code.
diff --git a/changelog.d/8594.misc b/changelog.d/8594.misc
deleted file mode 100644
index d266ba19a..000000000
--- a/changelog.d/8594.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor optimisations in caching code.
diff --git a/changelog.d/8599.feature b/changelog.d/8599.feature
deleted file mode 100644
index 542993110..000000000
--- a/changelog.d/8599.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow running background tasks in a separate worker process.
diff --git a/changelog.d/8600.misc b/changelog.d/8600.misc
deleted file mode 100644
index a5a922e64..000000000
--- a/changelog.d/8600.misc
+++ /dev/null
@@ -1 +0,0 @@
-Update `mypy` static type checker to 0.790.
diff --git a/changelog.d/8606.feature b/changelog.d/8606.feature
deleted file mode 100644
index fad723c10..000000000
--- a/changelog.d/8606.feature
+++ /dev/null
@@ -1 +0,0 @@
-Limit appservice transactions to 100 persistent and 100 ephemeral events.
diff --git a/changelog.d/8609.misc b/changelog.d/8609.misc
deleted file mode 100644
index 5e3f3c199..000000000
--- a/changelog.d/8609.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type hints to profile and base handler.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 83b8e4897..c9d53e767 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -48,7 +48,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.21.2"
+__version__ = "1.22.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