| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | WIP | Linus Nordberg | 2016-11-23 | 1 | -55/+86 |
| | | | | | | | | | | | | 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 | -3/+3 |
| | | |||||
| * | Print the string "timing" and the name of the program in merge timing info. | Linus Nordberg | 2015-11-10 | 1 | -1/+1 |
| | | |||||
| * | Fix harmless cut'n'paste bugs in merge. | Linus Nordberg | 2015-11-10 | 1 | -5/+5 |
| | | |||||
| * | merge_backup.py and merge_dist.py take nodes on command line. | Linus Nordberg | 2015-11-10 | 1 | -3/+8 |
| | | | | | | If no nodes are given on the command line, all appropriate nodes are used. | ||||
| * | Merge is now run by shell script tools/merge. | Linus Nordberg | 2015-11-10 | 1 | -48/+54 |
| | | | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0 | ||||
| * | Get the imports correct. | Linus Nordberg | 2015-11-10 | 1 | -2/+2 |
| | | |||||
| * | Split merge.py into three pieces. | Linus Nordberg | 2015-11-10 | 1 | -0/+130 |
 |
index : user/linus/catlfish.git | |
| Linus' CT repository | Linus Nordberg |
| summaryrefslogtreecommitdiff |