Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

64346be2

Commit 64346be2 authored 7 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_stream_store

parents 884b26ae 22518e28

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/replication/slave/storage/events.py 0 additions, 2 deletions

synapse/replication/slave/storage/events.py
synapse/replication/slave/storage/room.py 4 additions, 17 deletions

synapse/replication/slave/storage/room.py
synapse/storage/__init__.py 0 additions, 15 deletions

synapse/storage/__init__.py
synapse/storage/event_push_actions.py 85 additions, 64 deletions

synapse/storage/event_push_actions.py
synapse/storage/room.py 121 additions, 118 deletions

synapse/storage/room.py
synapse/util/logcontext.py 11 additions, 9 deletions

synapse/util/logcontext.py

with 221 additions and 225 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