git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2d35cb a350681)
Merge pull request #506 from Intel-Corp/dev/vhostuser3rdparty-pr
authorGabe Rosenhouse <rosenhouse@users.noreply.github.com>
Mon, 18 Sep 2017 16:34:26 +0000 (09:34 -0700)
committerGitHub <noreply@github.com>
Mon, 18 Sep 2017 16:34:26 +0000 (09:34 -0700)
README: List vhostuser CNI as a 3rd party plugin


Trivial merge
CNI changes for updated IPAM