diff options
| author | David Baker <dbkr@matrix.org> | 2014-11-20 18:25:31 +0000 |
|---|---|---|
| committer | David Baker <dbkr@matrix.org> | 2014-11-20 18:25:31 +0000 |
| commit | 58f82e2e5484e9a83d0c184747442ac887e3b5d7 (patch) | |
| tree | fb93f00e8ba6334d2a524d530e0bbf581fd76d25 /synapse/http/endpoint.py | |
| parent | Merge branch 'develop' into pushers (diff) | |
| parent | Fix pep8 and pyflakes warnings (diff) | |
| download | synapse-58f82e2e5484e9a83d0c184747442ac887e3b5d7.tar.xz | |
Merge branch 'develop' into pushers
Diffstat (limited to 'synapse/http/endpoint.py')
| -rw-r--r-- | synapse/http/endpoint.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/endpoint.py b/synapse/http/endpoint.py index 7018ee3458..9c8888f565 100644 --- a/synapse/http/endpoint.py +++ b/synapse/http/endpoint.py @@ -27,8 +27,8 @@ import random logger = logging.getLogger(__name__) -def matrix_endpoint(reactor, destination, ssl_context_factory=None, - timeout=None): +def matrix_federation_endpoint(reactor, destination, ssl_context_factory=None, + timeout=None): """Construct an endpoint for the given matrix destination. Args: |