Merge pull request #20199 from ddstreet/unit_cgroup_catchup

author Lennart Poettering <lennart@poettering.net>

Thu, 12 Aug 2021 14:04:40 +0000 (16:04 +0200)

committer GitHub <noreply@github.com>

Thu, 12 Aug 2021 14:04:40 +0000 (16:04 +0200)
author Lennart Poettering <lennart@poettering.net>
Thu, 12 Aug 2021 14:04:40 +0000 (16:04 +0200)
committer GitHub <noreply@github.com>
Thu, 12 Aug 2021 14:04:40 +0000 (16:04 +0200)
diff --cc src/core/manager.c
Simple merge
diff --cc src/core/unit.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Thu, 12 Aug 2021 14:04:40 +0000 (16:04 +0200)
committer	GitHub <noreply@github.com>
	Thu, 12 Aug 2021 14:04:40 +0000 (16:04 +0200)
		1	2
src/core/manager.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/core/unit.c	patch \|	diff1 \|	diff2 \|	blob \| history