Merge remote-tracking branch 'origin/develop' into dbkr/pushers_use_event_actions

This commit is contained in:
David Baker 2016-04-07 16:35:22 +01:00
commit 9c99ab4572
32 changed files with 774 additions and 200 deletions

View file

@ -160,8 +160,8 @@ class ReceiptsStore(SQLBaseStore):
"content": content,
}])
@cachedList(cache=get_linearized_receipts_for_room.cache, list_name="room_ids",
num_args=3, inlineCallbacks=True)
@cachedList(cached_method_name="get_linearized_receipts_for_room",
list_name="room_ids", num_args=3, inlineCallbacks=True)
def _get_linearized_receipts_for_rooms(self, room_ids, to_key, from_key=None):
if not room_ids:
defer.returnValue({})