git://git.halfball.org / cni.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03d4ba4 2f9ef4a)
Merge pull request #99 from kinvolk/alban/dns-config
authorStefan Junker <steveeJ@users.noreply.github.com>
Wed, 27 Jan 2016 07:49:16 +0000 (08:49 +0100)
committerStefan Junker <steveeJ@users.noreply.github.com>
Wed, 27 Jan 2016 07:49:16 +0000 (08:49 +0100)
*: add "dns" field to the configuration


Trivial merge
CNI changes for updated IPAM