git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 442852a 8aeb066)
Merge pull request #76 from eyakubovich/dns
authorEugene Yakubovich <eyakubovich@gmail.com>
Wed, 11 Nov 2015 00:59:31 +0000 (16:59 -0800)
committerEugene Yakubovich <eyakubovich@gmail.com>
Wed, 11 Nov 2015 00:59:31 +0000 (16:59 -0800)
spec: add "dns" field to the result JSON


Trivial merge
CNI changes for updated IPAM