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

2015-06-01 15:05:52 +01:00
parent d92b3884cc 8c7ca6d2c0
commit 7b6afa5a9b
1 changed files with 0 additions and 1 deletions
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -252,7 +252,6 @@ class RoomMemberHandler(BaseHandler):
        self.distributor.declare("user_joined_room")
        self.distributor.declare("user_left_room")

-    @defer.inlineCallbacks
    def get_room_members(self, room_id):
        return self.store.get_user_objs_in_room(room_id)