Merge pull request #9762 from poettering/nspawn-oci

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

Thu, 21 Mar 2019 10:01:53 +0000 (11:01 +0100)

committer GitHub <noreply@github.com>

Thu, 21 Mar 2019 10:01:53 +0000 (11:01 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 21 Mar 2019 10:01:53 +0000 (11:01 +0100)
committer GitHub <noreply@github.com>
Thu, 21 Mar 2019 10:01:53 +0000 (11:01 +0100)
diff --cc src/nspawn/nspawn-mount.c
Simple merge
diff --cc src/nspawn/nspawn-setuid.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 21 Mar 2019 10:01:53 +0000 (11:01 +0100)
committer	GitHub <noreply@github.com>
	Thu, 21 Mar 2019 10:01:53 +0000 (11:01 +0100)
		1	2
src/nspawn/nspawn-mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn-setuid.c	patch \|	diff1 \|	diff2 \|	blob \| history