shixiong/okd @ 5bfa7e8da79685e09097d266d6cf453729e704dc

Scott Dodson 50f63b2c5d Merge pull request #2112 from sdodson/dnsmasq-additional-config		%!s(int64=8) %!d(string=hai) anos
..
files	a069be8c5c - Prevent the script to override n number of the time the same nameserver	%!s(int64=8) %!d(string=hai) anos
handlers	31953e459c Add support for supplying a dnsmasq.conf file	%!s(int64=8) %!d(string=hai) anos
meta	bc11db0c73 Add openshift_node_dnsmasq	%!s(int64=9) %!d(string=hai) anos
tasks	3f51b98475 Restart dnsmasq encase it was already running	%!s(int64=8) %!d(string=hai) anos
templates	bc11db0c73 Add openshift_node_dnsmasq	%!s(int64=9) %!d(string=hai) anos