summary refs log tree commit diff
path: root/contrib/cmdclient/http.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-01 11:22:36 +0100
committerRichard van der Hoff <richard@matrix.org>2020-10-01 11:22:36 +0100
commitdb13a8607e94b2a31734fd964fd92292c5015057 (patch)
treea3e2e229550295a75958e12519bd4af002cf19ee /contrib/cmdclient/http.py
parentRevert federation-transaction-transmission backoff hacks (diff)
parentAdd prometheus metrics to track federation delays (#8430) (diff)
downloadsynapse-db13a8607e94b2a31734fd964fd92292c5015057.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'contrib/cmdclient/http.py')
-rw-r--r--contrib/cmdclient/http.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/contrib/cmdclient/http.py b/contrib/cmdclient/http.py

index cd3260b27d..345120b612 100644 --- a/contrib/cmdclient/http.py +++ b/contrib/cmdclient/http.py
@@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import print_function - import json import urllib from pprint import pformat