Merge pull request #4670 from htejun/systemd-controller-on-unified-v2

author Lennart Poettering <lennart@poettering.net>

Thu, 23 Feb 2017 15:23:02 +0000 (16:23 +0100)

committer GitHub <noreply@github.com>

Thu, 23 Feb 2017 15:23:02 +0000 (16:23 +0100)
author Lennart Poettering <lennart@poettering.net>
Thu, 23 Feb 2017 15:23:02 +0000 (16:23 +0100)
committer GitHub <noreply@github.com>
Thu, 23 Feb 2017 15:23:02 +0000 (16:23 +0100)
diff --cc configure.ac
Simple merge
diff --cc man/systemd.xml
Simple merge
diff --cc src/basic/def.h
Simple merge
diff --cc src/core/manager.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 23 Feb 2017 15:23:02 +0000 (16:23 +0100)
committer	GitHub <noreply@github.com>
	Thu, 23 Feb 2017 15:23:02 +0000 (16:23 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
man/systemd.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/def.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history