summaryrefslogtreecommitdiff
path: root/test/scripts/continuous-merge-test-run-1.sh
Commit message (Collapse)AuthorAgeFilesLines
* Increase timeouts waiting for merge.Linus Nordberg2016-12-011-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 Nordberg2016-11-251-14/+4
|
* Manual rebase onto master with map/robust-distribution.Linus Nordberg2016-11-251-0/+58