Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c0bebd00

Commit c0bebd00 authored 3 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/erikj/async_federation_base_branch' into release-v1.37

parents 88f9e8d6 c54db67d

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/10269.misc 1 addition, 0 deletions

changelog.d/10269.misc
changelog.d/10272.bugfix 1 addition, 0 deletions

changelog.d/10272.bugfix
synapse/app/generic_worker.py 2 additions, 0 deletions

synapse/app/generic_worker.py
synapse/federation/federation_server.py 96 additions, 2 deletions

synapse/federation/federation_server.py
synapse/storage/databases/main/__init__.py 2 additions, 0 deletions

synapse/storage/databases/main/__init__.py
synapse/storage/databases/main/event_federation.py 106 additions, 3 deletions

synapse/storage/databases/main/event_federation.py
synapse/storage/databases/main/lock.py 334 additions, 0 deletions

synapse/storage/databases/main/lock.py
synapse/storage/schema/main/delta/59/15locks.sql 37 additions, 0 deletions

synapse/storage/schema/main/delta/59/15locks.sql
synapse/storage/schema/main/delta/59/16federation_inbound_staging.sql 32 additions, 0 deletions

...age/schema/main/delta/59/16federation_inbound_staging.sql
sytest-blacklist 6 additions, 0 deletions

sytest-blacklist
tests/storage/databases/main/test_lock.py 100 additions, 0 deletions

tests/storage/databases/main/test_lock.py

with 717 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