summaryrefslogtreecommitdiff
path: root/tools/merge_sth.py
Commit message (Expand)AuthorAgeFilesLines
* Verify config file signatureMagnus Ahltorp2017-02-011-1/+2
* Update copyright headers.Linus Nordberg2017-01-121-1/+1
* Add a bit of documentation.Linus Nordberg2016-11-251-1/+4
* Merge remote-tracking branch 'refs/remotes/map/python-requests-chunked'Linus Nordberg2016-07-111-2/+3
|\
| * Use python requests package instead of urllib2Magnus Ahltorp2016-03-091-2/+3
* | Make merge_sth work again after last commit.Linus Nordberg2015-11-201-2/+1
* | Remove debug printouts from merge programs.Linus Nordberg2015-11-201-2/+2
|/
* Print the string "timing" and the name of the program in merge timing info.Linus Nordberg2015-11-101-1/+1
* Fix backup-quorum-size and use it.Linus Nordberg2015-11-101-3/+10
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-0/+123