update dns config file
Merge branch 'master' into thinkpad