Merge pull request #47640 from adk3798/no-cgroups

author Adam King <47704447+adk3798@users.noreply.github.com>

Tue, 13 Sep 2022 15:59:13 +0000 (11:59 -0400)

committer GitHub <noreply@github.com>

Tue, 13 Sep 2022 15:59:13 +0000 (11:59 -0400)
author Adam King <47704447+adk3798@users.noreply.github.com>
Tue, 13 Sep 2022 15:59:13 +0000 (11:59 -0400)
committer GitHub <noreply@github.com>
Tue, 13 Sep 2022 15:59:13 +0000 (11:59 -0400)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Tue, 13 Sep 2022 15:59:13 +0000 (11:59 -0400)
committer	GitHub <noreply@github.com>
	Tue, 13 Sep 2022 15:59:13 +0000 (11:59 -0400)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/serve.py	patch \|	diff1 \|	diff2 \|	blob \| history