summaryrefslogtreecommitdiff
path: root/tools/merge.py
Commit message (Collapse)AuthorAgeFilesLines
* merge.py: Only ask node that actually has the entry.Magnus Ahltorp2015-02-191-21/+70
| | | | | Fetch multiple entries from storage node. Chunk sendlog.
* Move hardcoded merge parameters to command lineMagnus Ahltorp2015-01-281-12/+16
|
* merge.py: add call to storage/getentry since fetchnewentries no longer gives ↵Magnus Ahltorp2015-01-281-2/+18
| | | | us the actual entry
* Merge remote-tracking branch 'refs/remotes/map/external-merge3' into ↵Linus Nordberg2014-10-291-4/+53
|\ | | | | | | | | | | | | | | | | merging-external-merge Conflicts: src/v1.erl tools/merge.py tools/testcase1.py
| * 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 supportMagnus Ahltorp2014-10-241-0/+133
|
* Copyright NORDUnet.Linus Nordberg2014-10-291-2/+2
|
* Added external merging supportMagnus Ahltorp2014-10-291-0/+133