diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 22:38:21 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 22:38:21 -0400 |
commit | 6f4bc6d01d6eed5211021fd29ef152f96c03c357 (patch) | |
tree | 1f0a6e344096d8f40283be7c1e74be6eb45735ca /synapse/util/async_helpers.py | |
parent | rename get_devices_by_remote to get_device_updates_by_remote (diff) | |
parent | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify (diff) | |
download | synapse-6f4bc6d01d6eed5211021fd29ef152f96c03c357.tar.xz |
Merge branch 'develop' into cross-signing_federation
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, |