diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
| commit | cd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch) | |
| tree | 533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /synapse/rest/client/v2_alpha/sync.py | |
| parent | Newsfile (diff) | |
| parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
| download | synapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/rest/client/v2_alpha/sync.py')
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 541a6b0e10..ccd8b17b23 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -394,7 +394,7 @@ class SyncRestServlet(RestServlet): # We've had bug reports that events were coming down under the # wrong room. if event.room_id != room.room_id: - logger.warn( + logger.warning( "Event %r is under room %r instead of %r", event.event_id, room.room_id, |