Updated Branches: refs/heads/master af5bf94b4 -> 5e87b0a38
Removing filterwin2k option Signed-off-by: Chiradeep Vittal <chirad...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e87b0a3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e87b0a3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e87b0a3 Branch: refs/heads/master Commit: 5e87b0a38540f85cbbcf5a19d404347b63649c46 Parents: af5bf94 Author: Dennis Lawler <dlaw...@gmail.com> Authored: Mon Apr 29 15:10:09 2013 -0700 Committer: Chiradeep Vittal <chirad...@apache.org> Committed: Mon May 6 14:38:10 2013 -0700 ---------------------------------------------------------------------- .../systemvm/debian/config/etc/dnsmasq.conf.tmpl | 2 +- patches/systemvm/debian/config/etc/vpcdnsmasq.conf | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e87b0a3/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl b/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl index 7d656cb..38e5a8b 100644 --- a/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl +++ b/patches/systemvm/debian/config/etc/dnsmasq.conf.tmpl @@ -27,7 +27,7 @@ bogus-priv # so don't use it if you use eg Kerberos, SIP, XMMP or Google-talk. # This option only affects forwarding, SRV records originating for # dnsmasq (via srv-host= lines) are not suppressed by it. -filterwin2k +# filterwin2k # Change this line if you want dns to get its upstream servers from # somewhere other that /etc/resolv.conf http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e87b0a3/patches/systemvm/debian/config/etc/vpcdnsmasq.conf ---------------------------------------------------------------------- diff --git a/patches/systemvm/debian/config/etc/vpcdnsmasq.conf b/patches/systemvm/debian/config/etc/vpcdnsmasq.conf index 3717fc8..3622d0e 100644 --- a/patches/systemvm/debian/config/etc/vpcdnsmasq.conf +++ b/patches/systemvm/debian/config/etc/vpcdnsmasq.conf @@ -460,6 +460,3 @@ log-facility=/var/log/dnsmasq.log # Include a another lot of configuration options. #conf-file=/etc/dnsmasq.more.conf conf-dir=/etc/dnsmasq.d - -# Don't reply Windows's periodical DNS request -filterwin2k
