Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

5f14e7e9

Commit 5f14e7e9 authored 8 years ago by Richard van der Hoff Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #2010 from matrix-org/rav/fix_txnq_wedge

Fix assertion to stop transaction queue getting wedged

parents 3b2dd1b3 29ed09e8

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/transaction_queue.py 5 additions, 0 deletions

synapse/federation/transaction_queue.py
synapse/replication/slave/storage/_slaved_id_tracker.py 5 additions, 0 deletions

synapse/replication/slave/storage/_slaved_id_tracker.py
synapse/storage/deviceinbox.py 3 additions, 3 deletions

synapse/storage/deviceinbox.py
synapse/storage/devices.py 1 addition, 1 deletion

synapse/storage/devices.py
synapse/storage/util/id_generators.py 14 additions, 0 deletions

synapse/storage/util/id_generators.py
synapse/util/caches/stream_change_cache.py 1 addition, 1 deletion

synapse/util/caches/stream_change_cache.py

with 29 additions and 5 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