git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 616702b 07a993d)
Merge pull request #176 from dcbw/ns-test-fix
authorZach Gershman <zachgersh@users.noreply.github.com>
Mon, 18 Apr 2016 17:44:08 +0000 (10:44 -0700)
committerZach Gershman <zachgersh@users.noreply.github.com>
Mon, 18 Apr 2016 17:44:08 +0000 (10:44 -0700)
ns: fix reading net namespace in multi-threaded processes


Trivial merge
CNI changes for updated IPAM