summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
Commit message (Collapse)AuthorAgeFilesLines
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-09-271-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 Nordberg2015-09-271-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 Nordberg2015-09-271-2/+2
|
* Split merge.py into three pieces.Linus Nordberg2015-09-271-0/+130