diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:14:45 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:14:45 -0400 |
| commit | 0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec (patch) | |
| tree | 9dccb1711608f8c0b3a6dcd22eaa6f100c7a4e17 /synapse/http/matrixfederationclient.py | |
| parent | use something that's the right type for user_id (diff) | |
| parent | Servers-known-about statistic (#5981) (diff) | |
| download | synapse-0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec.tar.xz | |
Merge branch 'develop' into cross-signing_sig_upload
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 4326e98a28..3f7c93ffcb 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -345,7 +345,6 @@ class MatrixFederationHttpClient(object): else: query_bytes = b"" - # Retreive current span scope = start_active_span( "outgoing-federation-request", tags={ |