Merge pull request #8815 from poettering/get-unit-by-cgroup

author Lennart Poettering <lennart@poettering.net>

Wed, 2 May 2018 08:51:48 +0000 (10:51 +0200)

committer GitHub <noreply@github.com>

Wed, 2 May 2018 08:51:48 +0000 (10:51 +0200)
author Lennart Poettering <lennart@poettering.net>
Wed, 2 May 2018 08:51:48 +0000 (10:51 +0200)
committer GitHub <noreply@github.com>
Wed, 2 May 2018 08:51:48 +0000 (10:51 +0200)
diff --cc doc/CGROUP_DELEGATION.md
Simple merge
diff --cc src/core/dbus-manager.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Wed, 2 May 2018 08:51:48 +0000 (10:51 +0200)
committer	GitHub <noreply@github.com>
	Wed, 2 May 2018 08:51:48 +0000 (10:51 +0200)
		1	2
doc/CGROUP_DELEGATION.md	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/dbus-manager.c	patch \|	diff1 \|	diff2 \|	blob \| history