summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
Commit message (Collapse)AuthorAgeFilesLines
* Remove erroneous 'filedb' db name from python mergeMagnus Ahltorp2017-07-261-1/+1
|
* Change paths/mergedb to paths/db in local configdocgen2Magnus Ahltorp2017-07-251-1/+1
| | | | Remove unused config variable paths/publickeys
* Update copyright headers.Linus Nordberg2017-01-121-1/+1
|
* Add a bit of documentation.Linus Nordberg2016-11-251-1/+4
|
* Change algorithm for merge backup and merge distMagnus Ahltorp2016-11-021-61/+79
|
* Send list of entries to frontendMagnus Ahltorp2016-11-021-20/+32
| | | | Handle connection error
* Added permdb support to mergeMagnus Ahltorp2016-07-111-3/+3
|
* Print the string "timing" and the name of the program in merge timing info.Linus Nordberg2015-11-101-1/+1
|
* Fix harmless cut'n'paste bugs in merge.Linus Nordberg2015-11-101-5/+5
|
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-11-101-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-11-101-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-11-101-2/+2
|
* Split merge.py into three pieces.Linus Nordberg2015-11-101-0/+130