diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
commit | 9c94b48bf154fff1ac3550213ddb65b33fbb6ba8 (patch) | |
tree | e7ad5ba3aa90d3cb57906bf38d3c2cac352e95d3 /synapse/util/async_helpers.py | |
parent | clean up code a bit (diff) | |
parent | Update black to 19.10b0 (#6304) (diff) | |
download | synapse-9c94b48bf154fff1ac3550213ddb65b33fbb6ba8.tar.xz |
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/util/async_helpers.py')
-rw-r--r-- | synapse/util/async_helpers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py index b60a604474..5c4de2e69f 100644 --- a/synapse/util/async_helpers.py +++ b/synapse/util/async_helpers.py @@ -309,7 +309,7 @@ class Linearizer(object): ) else: - logger.warn( + logger.warning( "Unexpected exception waiting for linearizer lock %r for key %r", self.name, key, |