Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop

2015-11-17 18:27:17 +00:00 · 2015-11-17 18:27:17 +00:00 · a9770e5d24
parent 391f2aa56c afdfd12bdf
commit a9770e5d24
1 changed files with 3 additions and 0 deletions
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@ -491,6 +491,9 @@ class _JsonProducer(object):
    def stopProducing(self):
        pass

+    def resumeProducing(self):
+        pass
+

 def _flatten_response_never_received(e):
    if hasattr(e, "reasons"):