Merge pull request #10785 from poettering/cgroup-join-removal

author Lennart Poettering <lennart@poettering.net>

Fri, 16 Nov 2018 16:53:26 +0000 (17:53 +0100)

committer GitHub <noreply@github.com>

Fri, 16 Nov 2018 16:53:26 +0000 (17:53 +0100)
author Lennart Poettering <lennart@poettering.net>
Fri, 16 Nov 2018 16:53:26 +0000 (17:53 +0100)
committer GitHub <noreply@github.com>
Fri, 16 Nov 2018 16:53:26 +0000 (17:53 +0100)
diff --cc TODO
Simple merge
diff --cc src/basic/cgroup-util.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 16 Nov 2018 16:53:26 +0000 (17:53 +0100)
committer	GitHub <noreply@github.com>
	Fri, 16 Nov 2018 16:53:26 +0000 (17:53 +0100)
		1	2
TODO	patch \|	diff1 \|	diff2 \|	blob \| history
src/basic/cgroup-util.c	patch \|	diff1 \|	diff2 \|	blob \| history