Merge pull request #45241 from rkachach/fix_issue_51072

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

Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)

committer GitHub <noreply@github.com>

Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)
author Adam King <47704447+adk3798@users.noreply.github.com>
Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)
committer GitHub <noreply@github.com>
Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/services/monitoring.py
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)
committer	GitHub <noreply@github.com>
	Fri, 25 Mar 2022 12:33:54 +0000 (08:33 -0400)
		1	2
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/services/monitoring.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/test_services.py	patch \|	diff1 \|	diff2 \|	blob \| history