Merge pull request #12106 from poettering/nosuidns

author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>

Tue, 26 Mar 2019 07:58:00 +0000 (08:58 +0100)

committer GitHub <noreply@github.com>

Tue, 26 Mar 2019 07:58:00 +0000 (08:58 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 26 Mar 2019 07:58:00 +0000 (08:58 +0100)
committer GitHub <noreply@github.com>
Tue, 26 Mar 2019 07:58:00 +0000 (08:58 +0100)
diff --cc src/core/execute.c
Simple merge
diff --cc src/nspawn/nspawn-mount.c
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 26 Mar 2019 07:58:00 +0000 (08:58 +0100)
committer	GitHub <noreply@github.com>
	Tue, 26 Mar 2019 07:58:00 +0000 (08:58 +0100)
		1	2
src/core/execute.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn-mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history