Merge pull request #3549 from poettering/resolved-more
authorTom Gundersen <teg@jklm.no>
Thu, 23 Jun 2016 23:26:25 +0000 (01:26 +0200)
committerGitHub <noreply@github.com>
Thu, 23 Jun 2016 23:26:25 +0000 (01:26 +0200)
resolved: more fixes, among them "systemctl-resolve --status" to see DNS configuration in effect, and a local DNS stub listener on 127.0.0.53

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge