]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #5369 from poettering/nspawn-resolved
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Sat, 18 Feb 2017 16:54:34 +0000 (11:54 -0500)
committerGitHub <noreply@github.com>
Sat, 18 Feb 2017 16:54:34 +0000 (11:54 -0500)
fixes for running nspawn+resolved in combination

1  2 
src/nspawn/nspawn.c

Simple merge