summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--CHANGES.md69
-rw-r--r--changelog.d/10556.doc1
-rw-r--r--changelog.d/10566.feature1
-rw-r--r--changelog.d/10601.misc1
-rw-r--r--changelog.d/10643.feature1
-rw-r--r--changelog.d/10648.doc1
-rw-r--r--changelog.d/10658.bugfix1
-rw-r--r--changelog.d/10693.removal1
-rw-r--r--changelog.d/10697.misc1
-rw-r--r--changelog.d/10704.bugfix1
-rw-r--r--changelog.d/10707.misc1
-rw-r--r--changelog.d/10712.feature1
-rw-r--r--changelog.d/10714.feature1
-rw-r--r--changelog.d/10727.misc1
-rw-r--r--changelog.d/10728.misc1
-rw-r--r--changelog.d/10730.bugfix1
-rw-r--r--changelog.d/10733.bugfix1
-rw-r--r--changelog.d/10735.doc1
-rw-r--r--changelog.d/10736.misc1
-rw-r--r--changelog.d/10738.misc1
-rw-r--r--changelog.d/10743.bugfix1
-rw-r--r--changelog.d/10744.misc1
-rw-r--r--changelog.d/10745.misc1
-rw-r--r--changelog.d/10746.misc1
-rw-r--r--changelog.d/10748.misc1
-rw-r--r--changelog.d/10750.misc1
-rw-r--r--changelog.d/10752.misc1
-rw-r--r--changelog.d/10753.misc1
-rw-r--r--changelog.d/10754.misc1
-rw-r--r--changelog.d/10755.misc1
-rw-r--r--changelog.d/10756.misc1
-rw-r--r--changelog.d/10757.bugfix1
-rw-r--r--changelog.d/10758.doc1
-rw-r--r--changelog.d/10759.feature1
-rw-r--r--changelog.d/10760.bugfix1
-rw-r--r--changelog.d/10771.misc1
-rw-r--r--changelog.d/10772.feature1
-rw-r--r--changelog.d/10773.misc1
-rw-r--r--changelog.d/10774.bugfix1
-rw-r--r--changelog.d/10775.misc1
-rw-r--r--changelog.d/10778.misc1
-rw-r--r--changelog.d/10779.misc1
-rw-r--r--changelog.d/10780.misc1
-rw-r--r--changelog.d/10781.misc1
-rw-r--r--changelog.d/10783.bugfix1
-rw-r--r--changelog.d/10784.misc1
-rw-r--r--changelog.d/10788.misc1
-rw-r--r--changelog.d/10789.misc1
-rw-r--r--changelog.d/10795.doc1
-rw-r--r--changelog.d/10798.misc1
-rw-r--r--changelog.d/10799.misc1
-rw-r--r--changelog.d/10804.doc1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
54 files changed, 76 insertions, 52 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 9908d7d9a0..8ff52ea136 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,72 @@
+Synapse 1.43.0rc1 (2021-09-14)
+==============================
+
+This release drops the deprecated, unstable API for [MSC2858](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2858-Multiple-SSO-Identity-Providers.md#unstable-prefix). Client authors should update their clients to use the stable API, available since Synapse 1.30.
+
+Features
+--------
+
+- Allow room creators to send historical events specified by [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) in existing room versions. ([\#10566](https://github.com/matrix-org/synapse/issues/10566))
+- Add config option to use non-default manhole password and keys. ([\#10643](https://github.com/matrix-org/synapse/issues/10643))
+- Skip final GC at shutdown to improve restart performance. ([\#10712](https://github.com/matrix-org/synapse/issues/10712))
+- Allow configuration of the oEmbed URLs used for URL previews. ([\#10714](https://github.com/matrix-org/synapse/issues/10714), [\#10759](https://github.com/matrix-org/synapse/issues/10759))
+- Prefer [room version 9](https://github.com/matrix-org/matrix-doc/pull/3375) for restricted rooms per the [room version capabilities](https://github.com/matrix-org/matrix-doc/pull/3244) API. ([\#10772](https://github.com/matrix-org/synapse/issues/10772))
+
+
+Bugfixes
+--------
+
+- Fix a long-standing bug where room avatars were not included in email notifications. ([\#10658](https://github.com/matrix-org/synapse/issues/10658))
+- Added opentracing logging to help debug #9424. ([\#10704](https://github.com/matrix-org/synapse/issues/10704))
+- Fix a bug where the ordering algorithm was skipping the `origin_server_ts` step in the spaces summary resulting in unstable room orderings. ([\#10730](https://github.com/matrix-org/synapse/issues/10730))
+- Allow user registration via SSO to require consent tracking for SSO mapping providers that don't prompt for Matrix ID selection. Contributed by @AndrewFerr. ([\#10733](https://github.com/matrix-org/synapse/issues/10733))
+- Fix edge case when persisting events into a room where there are multiple events we previously hadn't calculated auth chains for (and hadn't marked as needing to be calculated). ([\#10743](https://github.com/matrix-org/synapse/issues/10743))
+- Fix a bug which prevented calls to `/createRoom` that included the `room_alias_name` parameter from being handled by worker processes. ([\#10757](https://github.com/matrix-org/synapse/issues/10757))
+- Only return the stripped state events for the `m.space.child` events in a room for the spaces summary from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946). ([\#10760](https://github.com/matrix-org/synapse/issues/10760))
+- Properly handle room upgrades of spaces. ([\#10774](https://github.com/matrix-org/synapse/issues/10774))
+- Fix a bug which generated invalid homeserver config when the `frontend_proxy` worker type was passed to the Synapse Worker-based Complement image. ([\#10783](https://github.com/matrix-org/synapse/issues/10783))
+
+
+Improved Documentation
+----------------------
+
+- Minor fix to the `media_repository` developer documentation. Contributed by @cuttingedge1109. ([\#10556](https://github.com/matrix-org/synapse/issues/10556))
+- Update the documentation to note that the `/spaces` and `/hierarchy` endpoints can be routed to workers. ([\#10648](https://github.com/matrix-org/synapse/issues/10648))
+- Clarify admin API documentation on undoing room deletions. ([\#10735](https://github.com/matrix-org/synapse/issues/10735))
+- Split up the modules documentation and add examples for module developers. ([\#10758](https://github.com/matrix-org/synapse/issues/10758))
+- Correct 2 typographical errors in the *Log Contexts* documentation. ([\#10795](https://github.com/matrix-org/synapse/issues/10795))
+- Fixed a wording mistake in the sample configuration. Contributed by @bramvdnheuvel:nltrix.net. ([\#10804](https://github.com/matrix-org/synapse/issues/10804))
+
+
+Deprecations and Removals
+-------------------------
+
+- Remove the [unstable MSC2858 API](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2858-Multiple-SSO-Identity-Providers.md#unstable-prefix), including the undocumented `experimental.msc2858_enabled` config option. The unstable API has been deprecated since Synapse 1.35. Client authors should update their clients to use the stable API introduced in Synapse 1.30 if they have not already done so. ([\#10693](https://github.com/matrix-org/synapse/issues/10693))
+
+
+Internal Changes
+----------------
+
+- Add type annotations to the synapse.util package. ([\#10601](https://github.com/matrix-org/synapse/issues/10601))
+- Ensure `rooms.creator` field is always populated for easy lookup in [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) usage later. ([\#10697](https://github.com/matrix-org/synapse/issues/10697))
+- Add missing type hints to REST servlets. ([\#10707](https://github.com/matrix-org/synapse/issues/10707), [\#10728](https://github.com/matrix-org/synapse/issues/10728), [\#10736](https://github.com/matrix-org/synapse/issues/10736))
+- Do not include rooms with unknown room versions in the spaces summary results. ([\#10727](https://github.com/matrix-org/synapse/issues/10727))
+- Additional error checking for the `preset` field when creating a room. ([\#10738](https://github.com/matrix-org/synapse/issues/10738))
+- Clean up some of the federation event authentication code for clarity. ([\#10744](https://github.com/matrix-org/synapse/issues/10744), [\#10745](https://github.com/matrix-org/synapse/issues/10745), [\#10746](https://github.com/matrix-org/synapse/issues/10746), [\#10771](https://github.com/matrix-org/synapse/issues/10771), [\#10773](https://github.com/matrix-org/synapse/issues/10773), [\#10781](https://github.com/matrix-org/synapse/issues/10781))
+- Add an index to `presence_stream` to hopefully speed up startups a little. ([\#10748](https://github.com/matrix-org/synapse/issues/10748))
+- Refactor event size checking code to simplify searching the codebase for the origins of certain error strings that are occasionally emitted. ([\#10750](https://github.com/matrix-org/synapse/issues/10750))
+- Move tests relating to rooms having encryption out of the user_directory tests. ([\#10752](https://github.com/matrix-org/synapse/issues/10752))
+- Use `attrs` internally for the URL preview code & update documentation. ([\#10753](https://github.com/matrix-org/synapse/issues/10753))
+- Minor speed ups when joining large rooms over federation. ([\#10754](https://github.com/matrix-org/synapse/issues/10754), [\#10755](https://github.com/matrix-org/synapse/issues/10755), [\#10756](https://github.com/matrix-org/synapse/issues/10756), [\#10780](https://github.com/matrix-org/synapse/issues/10780), [\#10784](https://github.com/matrix-org/synapse/issues/10784))
+- Add a constant for `m.federate`. ([\#10775](https://github.com/matrix-org/synapse/issues/10775))
+- Add a script to update the Debian changelog in a Docker container for systems that aren't Debian-based. ([\#10778](https://github.com/matrix-org/synapse/issues/10778))
+- Change the format of authenticated users in logs when a user is being puppeted by and admin user. ([\#10779](https://github.com/matrix-org/synapse/issues/10779))
+- Remove fixed and flakey tests from the sytest-blacklist. ([\#10788](https://github.com/matrix-org/synapse/issues/10788))
+- Improve internal details of the user directory code. ([\#10789](https://github.com/matrix-org/synapse/issues/10789))
+- Use direct references to config flags. ([\#10798](https://github.com/matrix-org/synapse/issues/10798))
+- Add a max version for the `jaeger-client` dependency for an incompatibility with the rust reporter. ([\#10799](https://github.com/matrix-org/synapse/issues/10799))
+
+
 Synapse 1.42.0 (2021-09-07)
 ===========================
 
diff --git a/changelog.d/10556.doc b/changelog.d/10556.doc
deleted file mode 100644
index 7526ae11db..0000000000
--- a/changelog.d/10556.doc
+++ /dev/null
@@ -1 +0,0 @@
-Minor fix to the `media_repository` developer documentation. Contributed by @cuttingedge1109.
\ No newline at end of file
diff --git a/changelog.d/10566.feature b/changelog.d/10566.feature
deleted file mode 100644
index 04575d76a9..0000000000
--- a/changelog.d/10566.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow room creators to send historical events specified by [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) in existing room versions.
diff --git a/changelog.d/10601.misc b/changelog.d/10601.misc
deleted file mode 100644
index 1227113ff3..0000000000
--- a/changelog.d/10601.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add type annotations to the synapse.util package.
diff --git a/changelog.d/10643.feature b/changelog.d/10643.feature
deleted file mode 100644
index bd63a3d258..0000000000
--- a/changelog.d/10643.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add config option to use non-default manhole password and keys.
\ No newline at end of file
diff --git a/changelog.d/10648.doc b/changelog.d/10648.doc
deleted file mode 100644
index 4bd8df5236..0000000000
--- a/changelog.d/10648.doc
+++ /dev/null
@@ -1 +0,0 @@
-Update the documentation to note that the `/spaces` and `/hierarchy` endpoints can be routed to workers.
diff --git a/changelog.d/10658.bugfix b/changelog.d/10658.bugfix
deleted file mode 100644
index a59d402933..0000000000
--- a/changelog.d/10658.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a long-standing bug where room avatars were not included in email notifications.
diff --git a/changelog.d/10693.removal b/changelog.d/10693.removal
deleted file mode 100644
index 0255a8be74..0000000000
--- a/changelog.d/10693.removal
+++ /dev/null
@@ -1 +0,0 @@
-Remove [unstable MSC2858 API](https://github.com/matrix-org/matrix-doc/blob/master/proposals/2858-Multiple-SSO-Identity-Providers.md#unstable-prefix), including the undocumented `experimental.msc2858_enabled` config option. The unstable API has been deprecated since Synapse 1.35. Client authors should update their clients to use the stable API introduced in Synapse 1.30 if they have not already done so.
diff --git a/changelog.d/10697.misc b/changelog.d/10697.misc
deleted file mode 100644
index a9ad17faf2..0000000000
--- a/changelog.d/10697.misc
+++ /dev/null
@@ -1 +0,0 @@
-Ensure `rooms.creator` field is always populated for easy lookup in [MSC2716](https://github.com/matrix-org/matrix-doc/pull/2716) usage later.
diff --git a/changelog.d/10704.bugfix b/changelog.d/10704.bugfix
deleted file mode 100644
index 4284cddc2b..0000000000
--- a/changelog.d/10704.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Added opentrace logging to help debug #9424.
\ No newline at end of file
diff --git a/changelog.d/10707.misc b/changelog.d/10707.misc
deleted file mode 100644
index 39a37b90b1..0000000000
--- a/changelog.d/10707.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to REST servlets.
diff --git a/changelog.d/10712.feature b/changelog.d/10712.feature
deleted file mode 100644
index d04db6f26f..0000000000
--- a/changelog.d/10712.feature
+++ /dev/null
@@ -1 +0,0 @@
-Skip final GC at shutdown to improve restart performance.
diff --git a/changelog.d/10714.feature b/changelog.d/10714.feature
deleted file mode 100644
index 7d18f5c133..0000000000
--- a/changelog.d/10714.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow configuration of the oEmbed URLs used for URL previews.
diff --git a/changelog.d/10727.misc b/changelog.d/10727.misc
deleted file mode 100644
index 63fe6e5c7d..0000000000
--- a/changelog.d/10727.misc
+++ /dev/null
@@ -1 +0,0 @@
-Do not include rooms with unknown room versions in the spaces summary results.
diff --git a/changelog.d/10728.misc b/changelog.d/10728.misc
deleted file mode 100644
index 39a37b90b1..0000000000
--- a/changelog.d/10728.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to REST servlets.
diff --git a/changelog.d/10730.bugfix b/changelog.d/10730.bugfix
deleted file mode 100644
index f1612d3c08..0000000000
--- a/changelog.d/10730.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where the ordering algorithm was skipping the `origin_server_ts` step in the spaces summary resulting in unstable room orderings.
diff --git a/changelog.d/10733.bugfix b/changelog.d/10733.bugfix
deleted file mode 100644
index 7053a00ca4..0000000000
--- a/changelog.d/10733.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Allow user registration via SSO to require consent tracking for SSO mapping providers that don't prompt for Matrix ID selection. Contributed by @AndrewFerr.
diff --git a/changelog.d/10735.doc b/changelog.d/10735.doc
deleted file mode 100644
index 5d6207afb9..0000000000
--- a/changelog.d/10735.doc
+++ /dev/null
@@ -1 +0,0 @@
-Clarify admin API documentation on undoing room deletions.
diff --git a/changelog.d/10736.misc b/changelog.d/10736.misc
deleted file mode 100644
index 39a37b90b1..0000000000
--- a/changelog.d/10736.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add missing type hints to REST servlets.
diff --git a/changelog.d/10738.misc b/changelog.d/10738.misc
deleted file mode 100644
index cef54153dc..0000000000
--- a/changelog.d/10738.misc
+++ /dev/null
@@ -1 +0,0 @@
-Additional error checking for the `preset` field when creating a room.
diff --git a/changelog.d/10743.bugfix b/changelog.d/10743.bugfix
deleted file mode 100644
index d597a19870..0000000000
--- a/changelog.d/10743.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix edge case when persisting events into a room where there are multiple events we previously hadn't calculated auth chains for (and hadn't marked as needing to be calculated).
diff --git a/changelog.d/10744.misc b/changelog.d/10744.misc
deleted file mode 100644
index 9a765435db..0000000000
--- a/changelog.d/10744.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10745.misc b/changelog.d/10745.misc
deleted file mode 100644
index 9a765435db..0000000000
--- a/changelog.d/10745.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10746.misc b/changelog.d/10746.misc
deleted file mode 100644
index 9a765435db..0000000000
--- a/changelog.d/10746.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10748.misc b/changelog.d/10748.misc
deleted file mode 100644
index b9e2c46087..0000000000
--- a/changelog.d/10748.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add an index to `presence_stream` to hopefully speed up startups a little.
diff --git a/changelog.d/10750.misc b/changelog.d/10750.misc
deleted file mode 100644
index ded5cf626c..0000000000
--- a/changelog.d/10750.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor event size checking code to simplify searching the codebase for the origins of certain error strings that are occasionally emitted.
\ No newline at end of file
diff --git a/changelog.d/10752.misc b/changelog.d/10752.misc
deleted file mode 100644
index 5f9aa23018..0000000000
--- a/changelog.d/10752.misc
+++ /dev/null
@@ -1 +0,0 @@
-Move tests relating to rooms having encryption out of the user_directory tests.
\ No newline at end of file
diff --git a/changelog.d/10753.misc b/changelog.d/10753.misc
deleted file mode 100644
index 1d0056e97a..0000000000
--- a/changelog.d/10753.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use `attrs` internally for the URL preview code & update documentation.
diff --git a/changelog.d/10754.misc b/changelog.d/10754.misc
deleted file mode 100644
index 3b7acff03f..0000000000
--- a/changelog.d/10754.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor speed ups when joining large rooms over federation.
diff --git a/changelog.d/10755.misc b/changelog.d/10755.misc
deleted file mode 100644
index 3b7acff03f..0000000000
--- a/changelog.d/10755.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor speed ups when joining large rooms over federation.
diff --git a/changelog.d/10756.misc b/changelog.d/10756.misc
deleted file mode 100644
index 3b7acff03f..0000000000
--- a/changelog.d/10756.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor speed ups when joining large rooms over federation.
diff --git a/changelog.d/10757.bugfix b/changelog.d/10757.bugfix
deleted file mode 100644
index bce36ef242..0000000000
--- a/changelog.d/10757.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which prevented calls to `/createRoom` that included the `room_alias_name` parameter from being handled by worker processes.
\ No newline at end of file
diff --git a/changelog.d/10758.doc b/changelog.d/10758.doc
deleted file mode 100644
index 9e4161d5e4..0000000000
--- a/changelog.d/10758.doc
+++ /dev/null
@@ -1 +0,0 @@
-Split up the modules documentation and add examples for module developers.
diff --git a/changelog.d/10759.feature b/changelog.d/10759.feature
deleted file mode 100644
index 7d18f5c133..0000000000
--- a/changelog.d/10759.feature
+++ /dev/null
@@ -1 +0,0 @@
-Allow configuration of the oEmbed URLs used for URL previews.
diff --git a/changelog.d/10760.bugfix b/changelog.d/10760.bugfix
deleted file mode 100644
index 4995c28190..0000000000
--- a/changelog.d/10760.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Only return the stripped state events for the `m.space.child` events in a room for the spaces summary from [MSC2946](https://github.com/matrix-org/matrix-doc/pull/2946).
diff --git a/changelog.d/10771.misc b/changelog.d/10771.misc
deleted file mode 100644
index 9a765435db..0000000000
--- a/changelog.d/10771.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10772.feature b/changelog.d/10772.feature
deleted file mode 100644
index 4a550711f6..0000000000
--- a/changelog.d/10772.feature
+++ /dev/null
@@ -1 +0,0 @@
-Prefer [room version 9](https://github.com/matrix-org/matrix-doc/pull/3375) for restricted rooms per the [room version caapabilities](https://github.com/matrix-org/matrix-doc/pull/3244) API.
diff --git a/changelog.d/10773.misc b/changelog.d/10773.misc
deleted file mode 100644
index 9a765435db..0000000000
--- a/changelog.d/10773.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10774.bugfix b/changelog.d/10774.bugfix
deleted file mode 100644
index 5c2f6f8ade..0000000000
--- a/changelog.d/10774.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Properly handle room upgrades of spaces.
diff --git a/changelog.d/10775.misc b/changelog.d/10775.misc
deleted file mode 100644
index ca87d7aed0..0000000000
--- a/changelog.d/10775.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a constant for `m.federate`.
diff --git a/changelog.d/10778.misc b/changelog.d/10778.misc
deleted file mode 100644
index db4309420b..0000000000
--- a/changelog.d/10778.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a script to update the Debian changelog in a Docker container for systems that aren't Debian-based.
diff --git a/changelog.d/10779.misc b/changelog.d/10779.misc
deleted file mode 100644
index 9275a83039..0000000000
--- a/changelog.d/10779.misc
+++ /dev/null
@@ -1 +0,0 @@
-Change the format of authenticated users in logs when a user is being puppeted by and admin user.
diff --git a/changelog.d/10780.misc b/changelog.d/10780.misc
deleted file mode 100644
index 3b7acff03f..0000000000
--- a/changelog.d/10780.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor speed ups when joining large rooms over federation.
diff --git a/changelog.d/10781.misc b/changelog.d/10781.misc
deleted file mode 100644
index 9a765435db..0000000000
--- a/changelog.d/10781.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some of the federation event authentication code for clarity.
diff --git a/changelog.d/10783.bugfix b/changelog.d/10783.bugfix
deleted file mode 100644
index f5b40d65a0..0000000000
--- a/changelog.d/10783.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug which generated invalid homeserver config when the `frontend_proxy` worker type was passed to the Synapse Worker-based Complement image.
\ No newline at end of file
diff --git a/changelog.d/10784.misc b/changelog.d/10784.misc
deleted file mode 100644
index 3b7acff03f..0000000000
--- a/changelog.d/10784.misc
+++ /dev/null
@@ -1 +0,0 @@
-Minor speed ups when joining large rooms over federation.
diff --git a/changelog.d/10788.misc b/changelog.d/10788.misc
deleted file mode 100644
index 568a85ac52..0000000000
--- a/changelog.d/10788.misc
+++ /dev/null
@@ -1 +0,0 @@
-Remove fixed and flakey tests from the sytest-blacklist.
diff --git a/changelog.d/10789.misc b/changelog.d/10789.misc
deleted file mode 100644
index 8a0b54e32a..0000000000
--- a/changelog.d/10789.misc
+++ /dev/null
@@ -1 +0,0 @@
-Improve internal details of the user directory code.
\ No newline at end of file
diff --git a/changelog.d/10795.doc b/changelog.d/10795.doc
deleted file mode 100644
index 3a0b622825..0000000000
--- a/changelog.d/10795.doc
+++ /dev/null
@@ -1 +0,0 @@
-Correct 2 typographical errors in the *Log Contexts* documentation.
diff --git a/changelog.d/10798.misc b/changelog.d/10798.misc
deleted file mode 100644
index 586a0b3a96..0000000000
--- a/changelog.d/10798.misc
+++ /dev/null
@@ -1 +0,0 @@
-Use direct references to config flags.
diff --git a/changelog.d/10799.misc b/changelog.d/10799.misc
deleted file mode 100644
index 91f7ede096..0000000000
--- a/changelog.d/10799.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add a max version for the `jaeger-client` dependency for an incompatibility with the rust reporter.
diff --git a/changelog.d/10804.doc b/changelog.d/10804.doc
deleted file mode 100644
index 5d57af3b5f..0000000000
--- a/changelog.d/10804.doc
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a wording mistake in the sample configuration. Contributed by @bramvdnheuvel:nltrix.net.
diff --git a/debian/changelog b/debian/changelog
index 4a37174a94..d3a6f6a4e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (1.43.0~rc1) stable; urgency=medium
+
+  * New synapse release 1.43.0~rc1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Tue, 14 Sep 2021 11:39:46 +0100
+
 matrix-synapse-py3 (1.42.0) stable; urgency=medium
 
   * New synapse release 1.42.0.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index dc7ae24295..d62ccd1dbc 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     pass
 
-__version__ = "1.42.0"
+__version__ = "1.43.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