summaryrefslogtreecommitdiff
path: root/tools/merge.py
Commit message (Expand)AuthorAgeFilesLines
* merge.py: use external signingMagnus Ahltorp2015-03-031-3/+2
* Move http_request to certtoolsMagnus Ahltorp2015-03-031-25/+10
* Require authentication for merge callsMagnus Ahltorp2015-02-271-10/+32
* merge.py: Only ask node that actually has the entry.Magnus Ahltorp2015-02-201-21/+70
* Move hardcoded merge parameters to command lineMagnus Ahltorp2015-02-201-12/+16
* merge.py: add call to storage/getentry since fetchnewentries no longer gives ...Magnus Ahltorp2015-02-201-2/+18
* Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-...Linus Nordberg2014-10-291-4/+53
|\
| * merge.py: send whole sth in sendsth callMagnus Ahltorp2014-10-271-1/+26
| * Handle missing entries in mergeMagnus Ahltorp2014-10-271-2/+26
| * System tests for external mergeMagnus Ahltorp2014-10-241-1/+1
| * Added external merging supportmap-external-merge2Magnus Ahltorp2014-10-241-0/+133
* Copyright NORDUnet.Linus Nordberg2014-10-291-2/+2
* Added external merging supportMagnus Ahltorp2014-10-291-0/+133
generated by cgit v1.1 at 2024-12-27 07:05:52 +0000