Merge pull request #7816 from poettering/chase-pid

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

Mon, 15 Jan 2018 10:14:34 +0000 (14:14 +0400)

committer GitHub <noreply@github.com>

Mon, 15 Jan 2018 10:14:34 +0000 (14:14 +0400)
author Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 15 Jan 2018 10:14:34 +0000 (14:14 +0400)
committer GitHub <noreply@github.com>
Mon, 15 Jan 2018 10:14:34 +0000 (14:14 +0400)
diff --cc src/basic/fs-util.c
Simple merge
diff --cc src/core/service.c
Simple merge
diff --cc src/libsystemd/sd-daemon/sd-daemon.c
Simple merge
author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Mon, 15 Jan 2018 10:14:34 +0000 (14:14 +0400)
committer	GitHub <noreply@github.com>
	Mon, 15 Jan 2018 10:14:34 +0000 (14:14 +0400)
		1	2
src/basic/fs-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/service.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/libsystemd/sd-daemon/sd-daemon.c	patch \|	diff1 \|	diff2 \|	blob \| history