diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-15 14:25:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-15 14:25:46 +0100 |
| commit | ef184caf30e69593b5f224f4a0ffde3605da2153 (patch) | |
| tree | c4affbe31ecedbee84ddf70bfc2f2c39d15e831a /synapse/http/client.py | |
| parent | Use federation handler function rather than duplicate (diff) | |
| parent | Merge pull request #3690 from matrix-org/neilj/change_prometheus_mau_metric_name (diff) | |
| download | synapse-ef184caf30e69593b5f224f4a0ffde3605da2153.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index 3771e0b3f6..ab4fbf59b2 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -42,7 +42,7 @@ from twisted.web.http_headers import Headers from synapse.api.errors import Codes, HttpResponseException, SynapseError from synapse.http import cancelled_to_request_timed_out_error, redact_uri from synapse.http.endpoint import SpiderEndpoint -from synapse.util.async import add_timeout_to_deferred +from synapse.util.async_helpers import add_timeout_to_deferred from synapse.util.caches import CACHE_SIZE_FACTOR from synapse.util.logcontext import make_deferred_yieldable |