Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c044aca1

Commit c044aca1 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'erikj/reactor_metrics' into erikj/dictionary_cache

parents 0fbed2a8 ba5d34a8

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

demo/start.sh 2 additions, 1 deletion

demo/start.sh
setup.py 1 addition, 1 deletion

setup.py
synapse/http/matrixfederationclient.py 27 additions, 53 deletions

synapse/http/matrixfederationclient.py
synapse/metrics/__init__.py 29 additions, 0 deletions

synapse/metrics/__init__.py
synapse/python_dependencies.py 1 addition, 1 deletion

synapse/python_dependencies.py

with 60 additions and 56 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