diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2014-11-20 17:54:40 +0000 |
| commit | 8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5 (patch) | |
| tree | b1ebd402c0805f475500c9f36a0356322bf26f13 /synapse/http/endpoint.py | |
| parent | Fix pep8 codestyle warnings (diff) | |
| parent | Merge branch 'develop' into http_client_refactor (diff) | |
| download | synapse-8f8c484bc6d7e9a35d8d9a75fb629eca2a96f9f5.tar.xz | |
Merge pull request #20 from matrix-org/http_client_refactor
Http client refactor
Diffstat (limited to 'synapse/http/endpoint.py')
| -rw-r--r-- | synapse/http/endpoint.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index 7018ee3458..f1b14a5657 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -27,7 +27,7 @@ import random logger = logging.getLogger(__name__) -def matrix_endpoint(reactor, destination, ssl_context_factory=None, +def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None, timeout=None): """Construct an endpoint for the given matrix destination. |