Merge pull request #10850 from poettering/log-setup

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

Tue, 20 Nov 2018 12:36:45 +0000 (13:36 +0100)

committer GitHub <noreply@github.com>

Tue, 20 Nov 2018 12:36:45 +0000 (13:36 +0100)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 20 Nov 2018 12:36:45 +0000 (13:36 +0100)
committer GitHub <noreply@github.com>
Tue, 20 Nov 2018 12:36:45 +0000 (13:36 +0100)
diff --cc src/tmpfiles/tmpfiles.c
Simple merge
diff --cc src/veritysetup/veritysetup-generator.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Tue, 20 Nov 2018 12:36:45 +0000 (13:36 +0100)
committer	GitHub <noreply@github.com>
	Tue, 20 Nov 2018 12:36:45 +0000 (13:36 +0100)
		1	2
src/tmpfiles/tmpfiles.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/veritysetup/veritysetup-generator.c	patch \|	diff1 \|	diff2 \|	blob \| history