diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-13 11:55:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-13 11:55:20 +0100 |
| commit | 06750140f61dadcfcd07a384714e5cf094c5d3b4 (patch) | |
| tree | e5c28ebdf5f20df0f3002fcbf1a8a0c77c23f451 /synapse | |
| parent | Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache (diff) | |
| parent | PEP8 (diff) | |
| download | synapse-06750140f61dadcfcd07a384714e5cf094c5d3b4.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 4d74bd5d78..854e17a473 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object): producer ) - return self.clock.time_bound_deferred( request_deferred, time_out=timeout/1000. if timeout else 60, |