Merge pull request #12431 from poettering/tmpfiles-chmod-chown-order

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

Wed, 22 May 2019 15:23:28 +0000 (17:23 +0200)

committer GitHub <noreply@github.com>

Wed, 22 May 2019 15:23:28 +0000 (17:23 +0200)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 22 May 2019 15:23:28 +0000 (17:23 +0200)
committer GitHub <noreply@github.com>
Wed, 22 May 2019 15:23:28 +0000 (17:23 +0200)
diff --cc src/tmpfiles/tmpfiles.c
Simple merge
diff --cc test/test-functions
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Wed, 22 May 2019 15:23:28 +0000 (17:23 +0200)
committer	GitHub <noreply@github.com>
	Wed, 22 May 2019 15:23:28 +0000 (17:23 +0200)
		1	2
src/tmpfiles/tmpfiles.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/test-functions	patch \|	diff1 \|	diff2 \|	blob \| history