Merge pull request #13862 from zachsmith/systemd-tmpfiles-deprecate-for-force

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

Tue, 12 Nov 2019 09:28:59 +0000 (10:28 +0100)

committer GitHub <noreply@github.com>

Tue, 12 Nov 2019 09:28:59 +0000 (10:28 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 12 Nov 2019 09:28:59 +0000 (10:28 +0100)
committer GitHub <noreply@github.com>
Tue, 12 Nov 2019 09:28:59 +0000 (10:28 +0100)
diff --cc TODO
Simple merge
diff --cc src/tmpfiles/tmpfiles.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 12 Nov 2019 09:28:59 +0000 (10:28 +0100)
committer	GitHub <noreply@github.com>
	Tue, 12 Nov 2019 09:28:59 +0000 (10:28 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/tmpfiles/tmpfiles.c	patch \|	diff1 \|	diff2 \|	blob \| history