Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into erikj/reactor_metrics

This commit is contained in:
Mark Haines 2015-08-13 17:03:58 +01:00
parent a6c27de1aa 7eb4d626ba
commit 3d1cdda762
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup.cfg
View File

@ -16,3 +16,6 @@ ignore =
docs/* docs/*
pylint.cfg pylint.cfg
tox.ini tox.ini
[flake8]
max-line-length = 90

1
synapse/http/matrixfederationclient.py
View File

@ -142,7 +142,6 @@ class MatrixFederationHttpClient(object):
producer producer
) )
return self.clock.time_bound_deferred( return self.clock.time_bound_deferred(
request_deferred, request_deferred,
time_out=timeout/1000. if timeout else 60, time_out=timeout/1000. if timeout else 60,