From: Tom Denham <tom@tomdee.co.uk>
Date: Fri, 13 Jan 2017 01:06:04 +0000 (-0800)
Subject: Merge pull request #334 from squeed/host-local-dns
X-Git-Url: https://git.halfball.org/?a=commitdiff_plain;h=530dd71e193012895ff7beee42cd64a02e1993da;p=cni.git

Merge pull request #334 from squeed/host-local-dns

ipam/host-local: add ResolvConf argument for DNS configuration
---

530dd71e193012895ff7beee42cd64a02e1993da