Merge branch 'develop' into erikj/reactor_metrics

2015-08-13 17:03:58 +01:00 · 2015-08-13 17:03:58 +01:00 · 3d1cdda762
parent a6c27de1aa 7eb4d626ba
commit 3d1cdda762
2 changed files with 3 additions and 1 deletions
--- a/setup.cfg
+++ b/setup.cfg
@ -16,3 +16,6 @@ ignore =
    docs/*
    pylint.cfg
    tox.ini
+
+[flake8]
+max-line-length = 90
--- 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,