Merge event persistence move changelog entries

1 files changed, 1 insertions, 14 deletions

diff --git a/CHANGES.md b/CHANGES.md
index 1f1d7928fb..8449f892bf 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,10 +8,9 @@ Features
 - Add OpenID Connect login/registration support. Contributed by Quentin Gliech, on behalf of [les Connecteurs](https://connecteu.rs). ([\#7256](https://github.com/matrix-org/synapse/issues/7256), [\#7457](https://github.com/matrix-org/synapse/issues/7457))
 - Add room details admin endpoint. Contributed by Awesome Technologies Innovationslabor GmbH. ([\#7317](https://github.com/matrix-org/synapse/issues/7317))
 - Allow for using more than one spam checker module at once. ([\#7435](https://github.com/matrix-org/synapse/issues/7435))
-- Add `instance_map` config and route replication calls. ([\#7495](https://github.com/matrix-org/synapse/issues/7495))
 - Add additional authentication checks for `m.room.power_levels` event per [MSC2209](https://github.com/matrix-org/matrix-doc/pull/2209). ([\#7502](https://github.com/matrix-org/synapse/issues/7502))
 - Implement room version 6 per [MSC2240](https://github.com/matrix-org/matrix-doc/pull/2240). ([\#7506](https://github.com/matrix-org/synapse/issues/7506))
-- Add option to move event persistence off master. ([\#7517](https://github.com/matrix-org/synapse/issues/7517))
+- Add highly experimental option to move event persistence off master. ([\#7281](https://github.com/matrix-org/synapse/issues/7281), [\#7374](https://github.com/matrix-org/synapse/issues/7374), [\#7436](https://github.com/matrix-org/synapse/issues/7436), [\#7440](https://github.com/matrix-org/synapse/issues/7440), [\#7475](https://github.com/matrix-org/synapse/issues/7475), [\#7490](https://github.com/matrix-org/synapse/issues/7490), [\#7491](https://github.com/matrix-org/synapse/issues/7491), [\#7492](https://github.com/matrix-org/synapse/issues/7492), [\#7493](https://github.com/matrix-org/synapse/issues/7493), [\#7495](https://github.com/matrix-org/synapse/issues/7495), [\#7515](https://github.com/matrix-org/synapse/issues/7515), [\#7516](https://github.com/matrix-org/synapse/issues/7516), [\#7517](https://github.com/matrix-org/synapse/issues/7517), [\#7542](https://github.com/matrix-org/synapse/issues/7542))
 
 
 Bugfixes
@@ -54,35 +53,23 @@ Improved Documentation
 Internal Changes
 ----------------
 
-- Add `MultiWriterIdGenerator` to support multiple concurrent writers of streams. ([\#7281](https://github.com/matrix-org/synapse/issues/7281))
-- Move catchup of replication streams logic to worker. ([\#7374](https://github.com/matrix-org/synapse/issues/7374))
 - Add typing annotations in `synapse.federation`. ([\#7382](https://github.com/matrix-org/synapse/issues/7382))
 - Convert the room handler to async/await. ([\#7396](https://github.com/matrix-org/synapse/issues/7396))
 - Improve performance of `get_e2e_cross_signing_key`. ([\#7428](https://github.com/matrix-org/synapse/issues/7428))
 - Improve performance of `mark_as_sent_devices_by_remote`. ([\#7429](https://github.com/matrix-org/synapse/issues/7429), [\#7562](https://github.com/matrix-org/synapse/issues/7562))
-- Support any process writing to the cache invalidation stream. ([\#7436](https://github.com/matrix-org/synapse/issues/7436))
-- Refactor event persistence database functions in preparation for allowing them to be run on non-master processes. ([\#7440](https://github.com/matrix-org/synapse/issues/7440))
 - Add type hints to the SAML handler. ([\#7445](https://github.com/matrix-org/synapse/issues/7445))
 - Remove storage method `get_hosts_in_room` that is no longer called anywhere. ([\#7448](https://github.com/matrix-org/synapse/issues/7448))
 - Fix some typos in the `notice_expiry` templates. ([\#7449](https://github.com/matrix-org/synapse/issues/7449))
 - Convert the federation handler to async/await. ([\#7459](https://github.com/matrix-org/synapse/issues/7459))
 - Convert the search handler to async/await. ([\#7460](https://github.com/matrix-org/synapse/issues/7460))
-- Have all instance correctly respond to `REPLICATE` command. ([\#7475](https://github.com/matrix-org/synapse/issues/7475))
-- Clean up replication unit tests. ([\#7490](https://github.com/matrix-org/synapse/issues/7490))
-- Move event stream handling out of slave store. ([\#7491](https://github.com/matrix-org/synapse/issues/7491))
-- Allow censoring of events to happen on workers. ([\#7492](https://github.com/matrix-org/synapse/issues/7492))
-- Move `EventStream` handling into default `ReplicationDataHandler`. ([\#7493](https://github.com/matrix-org/synapse/issues/7493))
 - Add type hints to `synapse.event_auth`. ([\#7505](https://github.com/matrix-org/synapse/issues/7505))
 - Convert the room member handler to async/await. ([\#7507](https://github.com/matrix-org/synapse/issues/7507))
 - Add type hints to room member handler. ([\#7513](https://github.com/matrix-org/synapse/issues/7513))
-- Allow `ReplicationRestResource` to be added to workers. ([\#7515](https://github.com/matrix-org/synapse/issues/7515))
-- Add a worker store for search insertion, required for moving event persistence off master. ([\#7516](https://github.com/matrix-org/synapse/issues/7516))
 - Fix typing annotations in `tests.replication`. ([\#7518](https://github.com/matrix-org/synapse/issues/7518))
 - Remove some redundant Python 2 support code. ([\#7519](https://github.com/matrix-org/synapse/issues/7519))
 - All endpoints now respond with a 200 OK for `OPTIONS` requests. ([\#7534](https://github.com/matrix-org/synapse/issues/7534), [\#7560](https://github.com/matrix-org/synapse/issues/7560))
 - Synapse now exports [detailed allocator statistics](https://doc.pypy.org/en/latest/gc_info.html#gc-get-stats) and basic GC timings as Prometheus metrics (`pypy_gc_time_seconds_total` and `pypy_memory_bytes`) when run under PyPy. Contributed by Ivan Shapovalov. ([\#7536](https://github.com/matrix-org/synapse/issues/7536))
 - Remove Ubuntu Cosmic and Disco from the list of distributions which we provide `.deb`s for, due to end-of-life. ([\#7539](https://github.com/matrix-org/synapse/issues/7539))
-- Add ability to wait for replication streams. ([\#7542](https://github.com/matrix-org/synapse/issues/7542))
 - Make worker processes return a stubbed-out response to `GET /presence` requests. ([\#7545](https://github.com/matrix-org/synapse/issues/7545))
 - Optimise some references to `hs.config`. ([\#7546](https://github.com/matrix-org/synapse/issues/7546))
 - On upgrade room only send canonical alias once. ([\#7547](https://github.com/matrix-org/synapse/issues/7547))