From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Nov 2017 10:33:38 +0000 (+0100)
Subject: Merge pull request #7484 from poettering/sd-resolve-timeout
X-Git-Tag: v236~104
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9f034a10a2f57297ba468bceccea050b62807db;p=thirdparty%2Fsystemd.git

Merge pull request #7484 from poettering/sd-resolve-timeout

timeout sd-resolve tests
---

c9f034a10a2f57297ba468bceccea050b62807db