summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-17 18:27:17 +0000
committerErik Johnston <erik@matrix.org>2015-11-17 18:27:17 +0000
commita9770e5d24325321909798e5fc931cd2285f8455 (patch)
tree1b9e01c0126406d70900bc67369862fa83930e4e /synapse
parentMerge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop (diff)
parentImplement required method 'resumeProducing' (diff)
downloadsynapse-a9770e5d24325321909798e5fc931cd2285f8455.tar.xz
Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/http/matrixfederationclient.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index ca9591556d..5d80e0c4da 100644
--- 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"):