Merge pull request #4962 from poettering/root-directory-2

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

Thu, 9 Feb 2017 04:05:05 +0000 (23:05 -0500)

committer GitHub <noreply@github.com>

Thu, 9 Feb 2017 04:05:05 +0000 (23:05 -0500)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 9 Feb 2017 04:05:05 +0000 (23:05 -0500)
committer GitHub <noreply@github.com>
Thu, 9 Feb 2017 04:05:05 +0000 (23:05 -0500)
diff --cc TODO
Simple merge
diff --cc man/systemd-nspawn.xml
Simple merge
diff --cc man/systemd.exec.xml
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
diff --cc src/shared/dissect-image.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 9 Feb 2017 04:05:05 +0000 (23:05 -0500)
committer	GitHub <noreply@github.com>
	Thu, 9 Feb 2017 04:05:05 +0000 (23:05 -0500)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd-nspawn.xml	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd.exec.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/shared/dissect-image.c	patch \|	diff1 \|	diff2 \|	blob \| history