summary refs log tree commit diff
path: root/synapse/replication/slave
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-09-08 13:43:43 +0100
committerMark Haines <mark.haines@matrix.org>2016-09-08 13:43:43 +0100
commitfa9d36e050d942e76b2bd6a6d2c190215a1dac39 (patch)
tree806152a98d66013b94882c85cb1cb6129be62e78 /synapse/replication/slave
parentAdd a new method to enqueue the device messages rather than sending a dummy EDU (diff)
parentLog delta files we're applying (diff)
downloadsynapse-fa9d36e050d942e76b2bd6a6d2c190215a1dac39.tar.xz
Merge branch 'develop' into markjh/direct_to_device_federation
Diffstat (limited to 'synapse/replication/slave')
-rw-r--r--synapse/replication/slave/storage/events.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py
index cbebd5b2f7..15c52774a2 100644
--- a/synapse/replication/slave/storage/events.py
+++ b/synapse/replication/slave/storage/events.py
@@ -86,6 +86,9 @@ class SlavedEventStore(BaseSlavedStore):
     _get_state_groups_from_groups = (
         StateStore.__dict__["_get_state_groups_from_groups"]
     )
+    _get_state_groups_from_groups_txn = (
+        DataStore._get_state_groups_from_groups_txn.__func__
+    )
     _get_state_group_from_group = (
         StateStore.__dict__["_get_state_group_from_group"]
     )