diff options
| author | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2015-03-26 10:07:59 +0000 |
| commit | 4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b (patch) | |
| tree | 5ab27c5ebbfc762ee133223fb48e868b85474c79 /synapse/storage/roommember.py | |
| parent | Set the service ID as soon as it is known. (diff) | |
| parent | Allow a choice of LRU behaviour for Cache() by using LruCache() or OrderedDict() (diff) | |
| download | synapse-4edcbcee3b9579f4b50ecb97e566edab1a7c4c8b.tar.xz | |
Merge branch 'develop' into application-services-txn-reliability
Conflicts: synapse/storage/__init__.py
Diffstat (limited to 'synapse/storage/roommember.py')
| -rw-r--r-- | synapse/storage/roommember.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py index 65ffb4627f..52c37c76f5 100644 --- a/synapse/storage/roommember.py +++ b/synapse/storage/roommember.py @@ -212,7 +212,8 @@ class RoomMemberStore(SQLBaseStore): return self._simple_select_onecol( "room_hosts", {"room_id": room_id}, - "host" + "host", + desc="get_joined_hosts_for_room", ) def _get_members_by_dict(self, where_dict): |