diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
commit | 4bbef62124f0fb249e314e94a1b9c15204c8daa9 (patch) | |
tree | cc2e7458da160915f7224c0487f185e2433eaadb /synapse/replication/slave/storage/events.py | |
parent | More 0_0 in tests (diff) | |
parent | Merge pull request #1048 from matrix-org/erikj/fix_mail_name (diff) | |
download | synapse-4bbef62124f0fb249e314e94a1b9c15204c8daa9.tar.xz |
Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/replication/slave/storage/events.py')
-rw-r--r-- | synapse/replication/slave/storage/events.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/replication/slave/storage/events.py b/synapse/replication/slave/storage/events.py index f4f31f2d27..65e982a0ce 100644 --- a/synapse/replication/slave/storage/events.py +++ b/synapse/replication/slave/storage/events.py @@ -120,10 +120,15 @@ class SlavedEventStore(BaseSlavedStore): get_state_for_event = DataStore.get_state_for_event.__func__ get_state_for_events = DataStore.get_state_for_events.__func__ get_state_groups = DataStore.get_state_groups.__func__ + get_state_groups_ids = DataStore.get_state_groups_ids.__func__ + get_state_ids_for_event = DataStore.get_state_ids_for_event.__func__ + get_state_ids_for_events = DataStore.get_state_ids_for_events.__func__ get_recent_events_for_room = DataStore.get_recent_events_for_room.__func__ get_room_events_stream_for_rooms = ( DataStore.get_room_events_stream_for_rooms.__func__ ) + is_host_joined = DataStore.is_host_joined.__func__ + _is_host_joined = RoomMemberStore.__dict__["_is_host_joined"] get_stream_token_for_event = DataStore.get_stream_token_for_event.__func__ _set_before_and_after = staticmethod(DataStore._set_before_and_after) |