git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b2006e 48d3b46)
Merge pull request #328 from markstgodard/noop-cni-args
authorGabe Rosenhouse <rosenhouse@users.noreply.github.com>
Fri, 11 Nov 2016 06:24:58 +0000 (22:24 -0800)
committerGitHub <noreply@github.com>
Fri, 11 Nov 2016 06:24:58 +0000 (22:24 -0800)
noop plugin: support multiple CNI_ARGS


Trivial merge
CNI changes for updated IPAM