Merge branch 'erikj/perf_room_members_fix' of github.com:matrix-org/synapse into erikj/profile_rununtilconcurrent

This commit is contained in:
Erik Johnston 2015-06-01 15:05:52 +01:00
commit 7b6afa5a9b

View file

@ -252,7 +252,6 @@ class RoomMemberHandler(BaseHandler):
self.distributor.declare("user_joined_room") self.distributor.declare("user_joined_room")
self.distributor.declare("user_left_room") self.distributor.declare("user_left_room")
@defer.inlineCallbacks
def get_room_members(self, room_id): def get_room_members(self, room_id):
return self.store.get_user_objs_in_room(room_id) return self.store.get_user_objs_in_room(room_id)