Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

0fd17177

Commit 0fd17177 authored 5 years ago by Jorik Schellekens

Downloads
- Plain Diff

Merge branch 'release-v1.2.0' into develop

parents f99554b1 826e6ec3

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/5703.misc 1 addition, 0 deletions

changelog.d/5703.misc
docs/opentracing.rst 100 additions, 0 deletions

docs/opentracing.rst
docs/sample_config.yaml 2 additions, 12 deletions

docs/sample_config.yaml
synapse/config/tracer.py 2 additions, 12 deletions

synapse/config/tracer.py
synapse/logging/opentracing.py 125 additions, 0 deletions

synapse/logging/opentracing.py

with 230 additions and 24 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment