diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-09 14:46:03 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-09 14:46:03 -0500 |
| commit | 7024d7b86e181f293cfb1324e1979f593c6d0674 (patch) | |
| tree | 889bd04b933e4b5a2ec2546a1182b4d7bf6251b7 /tests/http/server/_base.py | |
| parent | Try fix Twisted/treq problems (diff) | |
| parent | Allow use of both `@trace` and `@tag_args` stacked on the same function (#13453) (diff) | |
| download | synapse-7024d7b86e181f293cfb1324e1979f593c6d0674.tar.xz | |
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts: synapse/logging/opentracing.py tests/logging/test_opentracing.py
Diffstat (limited to 'tests/http/server/_base.py')
| -rw-r--r-- | tests/http/server/_base.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/http/server/_base.py b/tests/http/server/_base.py |