summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
Commit message (Collapse)AuthorAgeFilesLines
* Add a test for when merge backup fails.Linus Nordberg2015-11-101-2/+38
| | | | Also, avoid tracebacks on ECONNREFUSED by catching urrllib2.URLError.
* merge_backup.py and merge_dist.py take nodes on command line.Linus Nordberg2015-11-101-0/+1
| | | | | 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-3/+52
| | | | | | | tools/merge run merge_fetch.py, merge_backup.py, merge_sth.py and merge_dist.py sequentially. TODO: test backupquorum != 0
* 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
| | | | Verify precerts in make tests too.
* 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