git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f777ca5 420a145)
Merge pull request #80 from eyakubovich/add-version
authorEugene Yakubovich <eyakubovich@gmail.com>
Wed, 9 Dec 2015 21:59:47 +0000 (13:59 -0800)
committerEugene Yakubovich <eyakubovich@gmail.com>
Wed, 9 Dec 2015 21:59:47 +0000 (13:59 -0800)
spec: add cniVersion to results and config


Trivial merge
CNI changes for updated IPAM