git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9731448 b999539)
Merge pull request #508 from squeed/cnitool-cid
authorCasey Callendrello <casey.callendrello@coreos.com>
Wed, 25 Oct 2017 12:58:57 +0000 (14:58 +0200)
committerGitHub <noreply@github.com>
Wed, 25 Oct 2017 12:58:57 +0000 (14:58 +0200)
cnitool: generate container id from the netns path


Trivial merge
CNI changes for updated IPAM