Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

2e05f5d7

Commit 2e05f5d7 authored 8 years ago by Richard van der Hoff Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #2025 from matrix-org/rav/no_reset_state_on_rejections

Avoid resetting state on rejected events

parents 2abe85d5 0c01f829

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/events/snapshot.py 26 additions, 0 deletions

synapse/events/snapshot.py
synapse/handlers/federation.py 10 additions, 0 deletions

synapse/handlers/federation.py
synapse/state.py 3 additions, 8 deletions

synapse/state.py
synapse/storage/event_federation.py 12 additions, 12 deletions

synapse/storage/event_federation.py
synapse/storage/events.py 217 additions, 64 deletions

synapse/storage/events.py
synapse/storage/state.py 10 additions, 0 deletions

synapse/storage/state.py

with 278 additions and 84 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