Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

d62ce972

Commit d62ce972 authored 7 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 70349872 2ec49826

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/federation.py 17 additions, 9 deletions

synapse/handlers/federation.py
synapse/replication/slave/storage/account_data.py 7 additions, 36 deletions

synapse/replication/slave/storage/account_data.py
synapse/replication/slave/storage/events.py 6 additions, 22 deletions

synapse/replication/slave/storage/events.py
synapse/replication/slave/storage/push_rule.py 7 additions, 17 deletions

synapse/replication/slave/storage/push_rule.py
synapse/replication/slave/storage/pushers.py 3 additions, 9 deletions

synapse/replication/slave/storage/pushers.py
synapse/storage/__init__.py 1 addition, 20 deletions

synapse/storage/__init__.py
synapse/storage/account_data.py 61 additions, 15 deletions

synapse/storage/account_data.py
synapse/storage/event_push_actions.py 74 additions, 71 deletions

synapse/storage/event_push_actions.py
synapse/storage/events.py 7 additions, 365 deletions

synapse/storage/events.py
synapse/storage/events_worker.py 395 additions, 0 deletions

synapse/storage/events_worker.py
synapse/storage/push_rule.py 56 additions, 16 deletions

synapse/storage/push_rule.py
synapse/storage/pusher.py 7 additions, 4 deletions

synapse/storage/pusher.py
synapse/storage/tags.py 6 additions, 10 deletions

synapse/storage/tags.py

with 647 additions and 594 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