Merge pull request #51217 from adk3798/wip-59547-quincy

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

Wed, 24 May 2023 19:40:10 +0000 (15:40 -0400)

committer GitHub <noreply@github.com>

Wed, 24 May 2023 19:40:10 +0000 (15:40 -0400)
author Adam King <47704447+adk3798@users.noreply.github.com>
Wed, 24 May 2023 19:40:10 +0000 (15:40 -0400)
committer GitHub <noreply@github.com>
Wed, 24 May 2023 19:40:10 +0000 (15:40 -0400)
diff --cc src/cephadm/cephadm
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Wed, 24 May 2023 19:40:10 +0000 (15:40 -0400)
committer	GitHub <noreply@github.com>
	Wed, 24 May 2023 19:40:10 +0000 (15:40 -0400)
		1	2
src/cephadm/cephadm	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history