| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge.py: Only ask node that actually has the entry. | Magnus Ahltorp | 2015-02-20 | 1 | -21/+70 |
| * | Move hardcoded merge parameters to command line | Magnus Ahltorp | 2015-02-20 | 1 | -12/+16 |
| * | merge.py: add call to storage/getentry since fetchnewentries no longer gives ... | Magnus Ahltorp | 2015-02-20 | 1 | -2/+18 |
| * | Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-... | Linus Nordberg | 2014-10-29 | 1 | -4/+53 |
| |\ | |||||
| | * | merge.py: send whole sth in sendsth call | Magnus Ahltorp | 2014-10-27 | 1 | -1/+26 |
| | * | Handle missing entries in merge | Magnus Ahltorp | 2014-10-27 | 1 | -2/+26 |
| | * | System tests for external merge | Magnus Ahltorp | 2014-10-24 | 1 | -1/+1 |
| | * | Added external merging support | Magnus Ahltorp | 2014-10-24 | 1 | -0/+133 |
| * | Copyright NORDUnet. | Linus Nordberg | 2014-10-29 | 1 | -2/+2 |
| * | Added external merging support | Magnus Ahltorp | 2014-10-29 | 1 | -0/+133 |
 |
index : user/map/catlfish.git | |
| Magnus' CT repository | Magnus Ahltorp |
| summaryrefslogtreecommitdiff |