]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #4061 from dm0-/coreos-1545
authorLennart Poettering <lennart@poettering.net>
Fri, 7 Oct 2016 21:38:03 +0000 (23:38 +0200)
committerGitHub <noreply@github.com>
Fri, 7 Oct 2016 21:38:03 +0000 (23:38 +0200)
resolved: add an option to disable the stub resolver

1  2 
man/resolved.conf.xml
src/resolve/resolved-conf.c

Simple merge
Simple merge