git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d5e6e6 726c6b4)
Merge pull request #291 from tomdee/SetupVeth
authorDan Williams <dcbw@redhat.com>
Wed, 31 Aug 2016 21:32:09 +0000 (16:32 -0500)
committerGitHub <noreply@github.com>
Wed, 31 Aug 2016 21:32:09 +0000 (16:32 -0500)
pkg/ip: Ensure that SetupVeth returns correct hostVeth


Trivial merge
CNI changes for updated IPAM