| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Unbreak the ordinary tests.pmerge2 | Linus Nordberg | 2016-11-25 | 1 | -0/+1 |
| | | |||||
| * | Parallelise merge_fetch.py. | Linus Nordberg | 2016-11-25 | 1 | -14/+192 |
| | | | | | | | | NOTE: Not supporting permdb yet! We're still not passing the tests because merge_backup.py exits when the secondary merge disappears. | ||||
| * | WIP | Linus Nordberg | 2016-11-23 | 1 | -24/+35 |
| | | | | | | | | | | | | 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. | ||||
| * | Add a bit of documentation. | Linus Nordberg | 2016-11-17 | 1 | -1/+4 |
| | | |||||
| * | Added permdb support to merge | Magnus Ahltorp | 2016-07-11 | 1 | -4/+5 |
| | | |||||
| * | Remove debug printouts from merge programs. | Linus Nordberg | 2015-11-20 | 1 | -1/+1 |
| | | |||||
| * | Fix _args -> args since we now use it. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Print the string "timing" and the name of the program in merge timing info. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Print timing information in merge_fetch too. | Linus Nordberg | 2015-11-10 | 1 | -0/+4 |
| | | |||||
| * | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -12/+36 |
| | | | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 | ||||
| * | Split merge.py into three pieces. | Linus Nordberg | 2015-11-10 | 1 | -0/+97 |
 |
index : user/linus/catlfish.git | |
| Linus' CT repository | Linus Nordberg |
| summaryrefslogtreecommitdiff |