git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59f58fb 1d398af)
Merge pull request #42 from steveeJ/plugins-args
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 3 Sep 2015 23:42:11 +0000 (01:42 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 3 Sep 2015 23:42:11 +0000 (01:42 +0200)
host-local: allow ip request via CNI_ARGS


Trivial merge
CNI changes for updated IPAM