diff options
| author | Linus Nordberg <linus@nordu.net> | 2016-12-01 11:15:05 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2016-12-01 11:15:05 +0100 |
| commit | 3abbd4a27979b0e4498b9bb955c715cda4123834 (patch) | |
| tree | 2e7a616b1e9cfb14e32182ceaad8bc7d411dec98 /doc/merge.txt | |
| parent | 4bdb1e33a8eb620f53420219d439421da135262f (diff) | |
Increase timeouts waiting for merge.
Increase from 15 to 40 seconds. In theory, it should never be more
than 20 seconds plus actual time to do the job with a merge interval
of 10 seconds. Max wait times are 3+1 seconds in fetch, 3s in backup,
10s in sth and 3s in dist.
Diffstat (limited to 'doc/merge.txt')
0 files changed, 0 insertions, 0 deletions