diff options
| author | Eric Eastwood <erice@element.io> | 2022-08-18 16:51:28 -0500 |
|---|---|---|
| committer | Eric Eastwood <erice@element.io> | 2022-08-18 16:51:28 -0500 |
| commit | 0f2bfa42242747bcf287614eef7a0ffff3653cd9 (patch) | |
| tree | 802a725cfe524e7c5d28e58d92ef053c193348a3 /rust/src | |
| parent | Refactor from feedback (diff) | |
| parent | Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry (diff) | |
| download | synapse-0f2bfa42242747bcf287614eef7a0ffff3653cd9.tar.xz | |
Merge branch 'madlittlemods/11850-migrate-to-opentelemetry' into madlittlemods/13356-messages-investigation-scratch-v1
Conflicts: synapse/federation/federation_client.py synapse/handlers/federation.py synapse/handlers/federation_event.py synapse/logging/tracing.py synapse/storage/controllers/persist_events.py synapse/storage/controllers/state.py synapse/storage/databases/main/events_worker.py synapse/util/ratelimitutils.py
Diffstat (limited to 'rust/src')
0 files changed, 0 insertions, 0 deletions