git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e03c76b efe4f37)
Merge pull request #450 from gunjan5/spec-version-mismatch
authorCasey Callendrello <casey.callendrello@coreos.com>
Mon, 8 May 2017 09:12:25 +0000 (11:12 +0200)
committerGitHub <noreply@github.com>
Mon, 8 May 2017 09:12:25 +0000 (11:12 +0200)
cniVersion and config structure mismatch


Trivial merge
CNI changes for updated IPAM