git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d9695e 33b2de4)
Merge pull request #108 from aanm/fix-ip-json-tag
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 18 Feb 2016 13:12:20 +0000 (14:12 +0100)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 18 Feb 2016 13:12:20 +0000 (14:12 +0100)
fixed ipam host-local IP json tag


Trivial merge
CNI changes for updated IPAM