Merge pull request #46301 from rkachach/fix_issue_55685

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

Thu, 19 May 2022 20:08:21 +0000 (16:08 -0400)

committer GitHub <noreply@github.com>

Thu, 19 May 2022 20:08:21 +0000 (16:08 -0400)
author Adam King <47704447+adk3798@users.noreply.github.com>
Thu, 19 May 2022 20:08:21 +0000 (16:08 -0400)
committer GitHub <noreply@github.com>
Thu, 19 May 2022 20:08:21 +0000 (16:08 -0400)
diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Thu, 19 May 2022 20:08:21 +0000 (16:08 -0400)
committer	GitHub <noreply@github.com>
	Thu, 19 May 2022 20:08:21 +0000 (16:08 -0400)
		1	2
src/pybind/mgr/cephadm/serve.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history