git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b6448f 2251ee1)
Merge pull request #154 from rosenhouse/withnetns-errors
authorZach Gershman <zachgersh@users.noreply.github.com>
Tue, 15 Mar 2016 15:39:01 +0000 (08:39 -0700)
committerZach Gershman <zachgersh@users.noreply.github.com>
Tue, 15 Mar 2016 15:39:01 +0000 (08:39 -0700)
WithNetNS restores original namespace when callback errors


Trivial merge
CNI changes for updated IPAM