summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
Commit message (Expand)AuthorAgeFilesLines
* Remove erroneous 'filedb' db name from python mergeMagnus Ahltorp2017-07-261-1/+1
* Use centralized config parsing in initlog.pyMagnus Ahltorp2017-07-261-11/+12
* Verify config file signatureMagnus Ahltorp2017-02-011-3/+3
* Merge remote-tracking branch 'refs/remotes/map/config-api-key'Linus Nordberg2017-01-231-21/+17
|\
| * API keys are now provided in the config file.Magnus Ahltorp2017-01-201-21/+17
* | Update copyright headers.Linus Nordberg2017-01-121-1/+1
|/
* Use sessions in merge_fetchMagnus Ahltorp2016-11-181-2/+2
* Change algorithm for merge backup and merge distMagnus Ahltorp2016-11-021-3/+22
* Send list of entries to frontendMagnus Ahltorp2016-11-021-9/+17
* Added permdb support to mergeMagnus Ahltorp2016-07-111-0/+31
* Do detection of where log ends before sending new hashesMagnus Ahltorp2016-03-151-2/+3
* Use python requests package instead of urllib2Magnus Ahltorp2016-03-091-67/+30
* Send many entries at a time in merge_backupMagnus Ahltorp2015-11-121-2/+5
* Add a test for when merge backup fails.Linus Nordberg2015-11-101-2/+38
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-11-101-0/+1
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-3/+52
* Lint nits.Linus Nordberg2015-11-101-38/+56
* Get the imports correct.Linus Nordberg2015-11-101-3/+1
* Correct two error printouts.Linus Nordberg2015-11-101-4/+6
* Split merge.py into three pieces.Linus Nordberg2015-11-101-3/+247
* Script for converting database to new formatMagnus Ahltorp2015-08-191-0/+15
* Wrap entries in plop wrapperMagnus Ahltorp2015-08-191-12/+31
* Return correct extra-data for precerts too (closes CATLFISH-56).Linus Nordberg2015-08-061-2/+3
* Preliminary merge secondary support. Change merge db to lowercase.Magnus Ahltorp2015-07-311-5/+9
* Fix copyright notes.Linus Nordberg2015-04-231-1/+1
* Add support for merge secondariesMagnus Ahltorp2015-04-231-0/+57