diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:09:54 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:09:54 +0100 |
| commit | 36317f3dad7bec8a601f0eeac5f499b0f13f0523 (patch) | |
| tree | d161e029d6d5da40c3cf7fd1d6dbd8f3163af6a1 /synapse/federation/federation_base.py | |
| parent | Merge pull request #159 from matrix-org/erikj/metrics_interface_config (diff) | |
| parent | Add doc strings (diff) | |
| download | synapse-36317f3dad7bec8a601f0eeac5f499b0f13f0523.tar.xz | |
Merge pull request #156 from matrix-org/erikj/join_perf
Make joining #matrix:matrix.org over federation quicker
Diffstat (limited to 'synapse/federation/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index 5217d91aab..f0430b2cb1 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -80,6 +80,7 @@ class FederationBase(object): destinations=[pdu.origin], event_id=pdu.event_id, outlier=outlier, + timeout=10000, ) if new_pdu: |