summaryrefslogtreecommitdiff
path: root/test/scripts/light-system-test-prepare-merge-takeover.sh
Commit message (Collapse)AuthorAgeFilesLines
* Refactor testsMagnus Ahltorp2017-03-021-6/+5
|
* Secondary merge node already has a logorder file.Linus Nordberg2017-02-081-1/+0
|
* Parallelised merge, sth phase.Linus Nordberg2017-02-071-2/+2
|
* merge_sth.py doesn't do the right thing when 'sth' is missing.Linus Nordberg2017-02-021-0/+1
| | | | See CATLFISH-88, CATLFISH-89 for a discussion.
* Parallelised merge, distribution phase.Linus Nordberg2017-02-011-0/+1
|
* Test failing merge backupMagnus Ahltorp2016-10-141-1/+1
| | | | Refactor tests
* Make tests run independently from cwdlarge-tests3Magnus Ahltorp2016-10-131-9/+7
|
* Specify where to source test.shvars from ('./').Linus Nordberg2016-10-061-1/+1
| | | | For people without '.' in PATH.
* Move tests to shell scriptsMagnus Ahltorp2016-10-051-0/+16