Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

42bc56da

Commit 42bc56da authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejson

parents 7eef84a9 9c24cff6

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/_base.py 10 additions, 0 deletions

synapse/config/_base.py
synapse/config/database.py 5 additions, 0 deletions

synapse/config/database.py
synapse/python_dependencies.py 1 addition, 1 deletion

synapse/python_dependencies.py
synapse/storage/__init__.py 5 additions, 0 deletions

synapse/storage/__init__.py
synapse/storage/_base.py 20 additions, 4 deletions

synapse/storage/_base.py
synapse/storage/roommember.py 50 additions, 18 deletions

synapse/storage/roommember.py
synapse/util/lrucache.py 110 additions, 0 deletions

synapse/util/lrucache.py
tests/storage/test_base.py 3 additions, 2 deletions

tests/storage/test_base.py
tests/util/test_lrucache.py 56 additions, 0 deletions

tests/util/test_lrucache.py
tests/utils.py 1 addition, 0 deletions

tests/utils.py

with 261 additions and 25 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