Merge pull request #7484 from poettering/sd-resolve-timeout
authorLennart Poettering <lennart@poettering.net>
Tue, 28 Nov 2017 10:33:38 +0000 (11:33 +0100)
committerGitHub <noreply@github.com>
Tue, 28 Nov 2017 10:33:38 +0000 (11:33 +0100)
timeout sd-resolve tests


Trivial merge