Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Increase timeouts waiting for merge. | Linus Nordberg | 2016-12-01 | 1 | -3/+3 |
| | | | | | | | 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. | ||||
* | Sleep less in tests. | Linus Nordberg | 2016-11-25 | 1 | -14/+4 |
| | |||||
* | Manual rebase onto master with map/robust-distribution. | Linus Nordberg | 2016-11-25 | 1 | -0/+58 |