git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab83df2 78daffc)
Merge pull request #20 from eyakubovich/flannel
authorEugene Yakubovich <eyakubovich@gmail.com>
Thu, 11 Jun 2015 22:39:53 +0000 (15:39 -0700)
committerEugene Yakubovich <eyakubovich@gmail.com>
Thu, 11 Jun 2015 22:39:53 +0000 (15:39 -0700)
add flannel plugin


Trivial merge
CNI changes for updated IPAM