Merge branch develop into server2server_signing

Conflicts:
	synapse/app/homeserver.py

2 files changed, 8 insertions, 4 deletions

diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index a8dd038b0b..b4235585a3 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -163,7 +163,8 @@ class ReplicationLayer(object):
         return defer.succeed(None)
 
     @log_function
-    def make_query(self, destination, query_type, args):
+    def make_query(self, destination, query_type, args,
+                   retry_on_dns_fail=True):
         """Sends a federation Query to a remote homeserver of the given type
         and arguments.
 
@@ -178,7 +179,9 @@ class ReplicationLayer(object):
             a Deferred which will eventually yield a JSON object from the
             response
         """
-        return self.transport_layer.make_query(destination, query_type, args)
+        return self.transport_layer.make_query(
+            destination, query_type, args, retry_on_dns_fail=retry_on_dns_fail
+        )
 
     @defer.inlineCallbacks
     @log_function
diff --git a/synapse/federation/transport.py b/synapse/federation/transport.py
index 5d595b7433..1f864f5fa7 100644
--- a/synapse/federation/transport.py
+++ b/synapse/federation/transport.py
@@ -195,13 +195,14 @@ class TransportLayer(object):
 
     @defer.inlineCallbacks
     @log_function
-    def make_query(self, destination, query_type, args):
+    def make_query(self, destination, query_type, args, retry_on_dns_fail):
         path = PREFIX + "/query/%s" % query_type
 
         response = yield self.client.get_json(
             destination=destination,
             path=path,
-            args=args
+            args=args,
+            retry_on_dns_fail=retry_on_dns_fail,
         )
 
         defer.returnValue(response)