Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

0f5d2cc3

Commit 0f5d2cc3 authored 7 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'rav/db_txn_time_in_millis' into rav/track_db_scheduling

parents 8615f19d 6324b65f

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/http/server.py 3 additions, 1 deletion

synapse/http/server.py
synapse/http/site.py 3 additions, 3 deletions

synapse/http/site.py
synapse/util/logcontext.py 23 additions, 9 deletions

synapse/util/logcontext.py
synapse/util/metrics.py 5 additions, 3 deletions

synapse/util/metrics.py
tests/crypto/test_keyring.py 7 additions, 7 deletions

tests/crypto/test_keyring.py
tests/util/test_logcontext.py 8 additions, 8 deletions

tests/util/test_logcontext.py

with 49 additions and 31 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