From 260db82a374e1a51ddc3ab44846483ba388d49f5 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 9 Jun 2021 17:19:53 +0100 Subject: [PATCH 1/2] Clean up a broken import in synapse/app/admin_cmd.py --- synapse/app/admin_cmd.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py index 68ae19c977ce..2878d2c14077 100644 --- a/synapse/app/admin_cmd.py +++ b/synapse/app/admin_cmd.py @@ -36,7 +36,6 @@ from synapse.replication.slave.storage.events import SlavedEventStore from synapse.replication.slave.storage.filtering import SlavedFilteringStore from synapse.replication.slave.storage.groups import SlavedGroupServerStore -from synapse.replication.slave.storage.presence import SlavedPresenceStore from synapse.replication.slave.storage.push_rule import SlavedPushRuleStore from synapse.replication.slave.storage.receipts import SlavedReceiptsStore from synapse.replication.slave.storage.registration import SlavedRegistrationStore @@ -54,7 +53,6 @@ class AdminCmdSlavedStore( SlavedApplicationServiceStore, SlavedRegistrationStore, SlavedFilteringStore, - SlavedPresenceStore, SlavedGroupServerStore, SlavedDeviceInboxStore, SlavedDeviceStore, From dbfc6c9c1c55a555c3d331ea6fc93605e377eabc Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 9 Jun 2021 17:25:58 +0100 Subject: [PATCH 2/2] Changelog --- changelog.d/10154.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/10154.bugfix diff --git a/changelog.d/10154.bugfix b/changelog.d/10154.bugfix new file mode 100644 index 000000000000..f70a3d47bcd6 --- /dev/null +++ b/changelog.d/10154.bugfix @@ -0,0 +1 @@ +Remove a broken import line in Synapse's admin_cmd worker. Broke in 1.33.0. \ No newline at end of file