Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

49963988

Commit 49963988 authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents f08bd958 8f5b858a

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/errors.py 7 additions, 1 deletion

synapse/api/errors.py
synapse/federation/federation_client.py 64 additions, 36 deletions

synapse/federation/federation_client.py
synapse/federation/transaction_queue.py 18 additions, 5 deletions

synapse/federation/transaction_queue.py
synapse/federation/transport/client.py 16 additions, 26 deletions

synapse/federation/transport/client.py
synapse/handlers/directory.py 10 additions, 1 deletion

synapse/handlers/directory.py
synapse/handlers/federation.py 13 additions, 7 deletions

synapse/handlers/federation.py
synapse/handlers/room.py 5 additions, 7 deletions

synapse/handlers/room.py
synapse/http/matrixfederationclient.py 36 additions, 6 deletions

synapse/http/matrixfederationclient.py

with 169 additions and 89 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