summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2021-06-11 11:34:40 +0100
committerGitHub <noreply@github.com>2021-06-11 11:34:40 +0100
commita15a046c9302775cef52a85a8cdfd067e716ab67 (patch)
tree92072e5dab627b1c3de94cf0972c3eb00c151f87
parentFix bug when running presence off master (#10149) (diff)
downloadsynapse-a15a046c9302775cef52a85a8cdfd067e716ab67.tar.xz
Clean up a broken import in admin_cmd.py (#10154)
-rw-r--r--changelog.d/10154.bugfix1
-rw-r--r--synapse/app/admin_cmd.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/changelog.d/10154.bugfix b/changelog.d/10154.bugfix
new file mode 100644
index 0000000000..f70a3d47bc
--- /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
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py
index 68ae19c977..2878d2c140 100644
--- a/synapse/app/admin_cmd.py
+++ b/synapse/app/admin_cmd.py
@@ -36,7 +36,6 @@ from synapse.replication.slave.storage.devices import SlavedDeviceStore
 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,