Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6982db96

Commit 6982db96 authored 3 years ago by Andrew Morgan

Downloads
- Plain Diff

Merge branch 'master' into develop

parents de0d088a 438a8594

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 12 additions, 3 deletions

CHANGES.md
UPGRADE.rst 18 additions, 0 deletions

UPGRADE.rst
debian/changelog 6 additions, 2 deletions

debian/changelog
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/logging/context.py 4 additions, 10 deletions

synapse/logging/context.py
synapse/metrics/background_process_metrics.py 4 additions, 11 deletions

synapse/metrics/background_process_metrics.py
synapse/replication/tcp/protocol.py 1 addition, 1 deletion

synapse/replication/tcp/protocol.py
synapse/util/metrics.py 9 additions, 5 deletions

synapse/util/metrics.py
tests/logging/test_terse_json.py 4 additions, 2 deletions

tests/logging/test_terse_json.py
tests/test_federation.py 1 addition, 1 deletion

tests/test_federation.py
tests/util/caches/test_descriptors.py 2 additions, 4 deletions

tests/util/caches/test_descriptors.py

with 62 additions and 40 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