summaryrefslogtreecommitdiff
path: root/tools/merge_backup.py
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/map/python-requests-chunked'Linus Nordberg2016-07-111-33/+69
|\
| * bugfix: re-added fetched_entriespython-requestsMagnus Ahltorp2016-03-151-0/+2
| * Do detection of where log ends before sending new hashesMagnus Ahltorp2016-03-151-33/+67
* | Remove debug printouts from merge programs.Linus Nordberg2015-11-201-1/+1
|/
* Send many entries at a time in merge_backupMagnus Ahltorp2015-11-121-7/+7
* Print the string "timing" and the name of the program in merge timing info.Linus Nordberg2015-11-101-1/+1
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-11-101-3/+10
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-7/+51
* Split merge.py into three pieces.Linus Nordberg2015-11-101-0/+108