Merge branch 'develop' into application-services-txn-reliability

Conflicts:
	synapse/storage/appservice.py

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/push/httppusher.py b/synapse/push/httppusher.py

index caca709f10..a02fed57b4 100644
--- a/synapse/push/httppusher.py
+++ b/synapse/push/httppusher.py
@@ -109,7 +109,7 @@ class HttpPusher(Pusher):
         try:
             resp = yield self.httpCli.post_json_get_json(self.url, notification_dict)
         except:
-            logger.exception("Failed to push %s ", self.url)
+            logger.warn("Failed to push %s ", self.url)
             defer.returnValue(False)
         rejected = []
         if 'rejected' in resp: