Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | WIP | Linus Nordberg | 2016-11-23 | 1 | -7/+55 |
| | | | | | | | | | | | Merge can run as four separate processes, plus a fifth controlling proces 'merge'. Tests are limited to testcase1.py and they're failing because of the test with the dead merge secondary. Tests are also time consuming because they're waiting for 60s each time a merge needs to be verified. This could be improved by peeking at the control files, for example. | ||||
* | Test failing merge backup | Magnus Ahltorp | 2016-10-14 | 1 | -0/+2 |
| | | | | Refactor tests | ||||
* | Quote '$@' in shell script. | Linus Nordberg | 2015-11-10 | 1 | -4/+4 |
| | |||||
* | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -0/+8 |
tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 |