summary refs log tree commit diff
path: root/rust/src
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-03 15:15:34 -0500
committerEric Eastwood <erice@element.io>2022-08-03 15:15:34 -0500
commit699dad008c13e8bdbec0f1df46ca2097faf489f8 (patch)
tree4335e41160679e2322b92f5240a8530e27125fe1 /rust/src
parentUse latested Twisted from source to fix contextvar issues causing OTEL `Faile... (diff)
parentAdd some tracing spans to give insight into local joins (#13439) (diff)
downloadsynapse-699dad008c13e8bdbec0f1df46ca2097faf489f8.tar.xz
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	docs/usage/configuration/config_documentation.md
	synapse/api/auth.py
Diffstat (limited to 'rust/src')
0 files changed, 0 insertions, 0 deletions