git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fb30a6 3bab8a2)
Merge pull request #227 from steveeJ/ns-verify
authorStefan Junker <steveeJ@users.noreply.github.com>
Thu, 26 May 2016 11:22:29 +0000 (13:22 +0200)
committerStefan Junker <steveeJ@users.noreply.github.com>
Thu, 26 May 2016 11:22:29 +0000 (13:22 +0200)
pkg/ns: consider PROCFS during NS verification


Trivial merge
CNI changes for updated IPAM