git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3450f08 8be31e1)
Merge pull request #308 from rosenhouse/fix-skel-tests-containerid
authorGabe Rosenhouse <rosenhouse@users.noreply.github.com>
Mon, 17 Oct 2016 22:02:27 +0000 (15:02 -0700)
committerGitHub <noreply@github.com>
Mon, 17 Oct 2016 22:02:27 +0000 (15:02 -0700)
skel tests: correct name of CNI_CONTAINERID in tests of env vars


Trivial merge
CNI changes for updated IPAM