git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5603239 75d983e)
Merge pull request #299 from tgraf/cilium-link
authorBrandon Philips <brandon@ifup.org>
Mon, 19 Sep 2016 21:31:54 +0000 (14:31 -0700)
committerGitHub <noreply@github.com>
Mon, 19 Sep 2016 21:31:54 +0000 (14:31 -0700)
List cilium as 3rd party plugin


Trivial merge
CNI changes for updated IPAM