Merge pull request #9024 from poettering/nspawn-attrs-more

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

Thu, 24 May 2018 14:27:27 +0000 (16:27 +0200)

committer GitHub <noreply@github.com>

Thu, 24 May 2018 14:27:27 +0000 (16:27 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 24 May 2018 14:27:27 +0000 (16:27 +0200)
committer GitHub <noreply@github.com>
Thu, 24 May 2018 14:27:27 +0000 (16:27 +0200)
diff --cc TODO
Simple merge
diff --cc src/nspawn/nspawn.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 24 May 2018 14:27:27 +0000 (16:27 +0200)
committer	GitHub <noreply@github.com>
	Thu, 24 May 2018 14:27:27 +0000 (16:27 +0200)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	patch \|	diff1 \|	diff2 \|	blob \| history