diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-01 15:05:52 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-01 15:05:52 +0100 |
| commit | 7b6afa5a9bb82976189d75104e80d59fb24e15d8 (patch) | |
| tree | fb6502e3727358d01a394fdb007584c0826b949a | |
| parent | Merge branch 'erikj/perf_room_members_fix' of github.com:matrix-org/synapse i... (diff) | |
| parent | Remove rogue @inlineCallbacks (diff) | |
| download | synapse-7b6afa5a9bb82976189d75104e80d59fb24e15d8.tar.xz | |
Merge branch 'erikj/perf_room_members_fix' of github.com:matrix-org/synapse into erikj/profile_rununtilconcurrent github/erikj/profile_rununtilconcurrent erikj/profile_rununtilconcurrent
| -rw-r--r-- | synapse/handlers/room.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 31efba0a9c..643ad4a09a 100644 --- 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) |