Merge pull request #49864 from adk3798/wip-58174-quincy

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

Fri, 17 Feb 2023 13:37:32 +0000 (08:37 -0500)

committer GitHub <noreply@github.com>

Fri, 17 Feb 2023 13:37:32 +0000 (08:37 -0500)
author Adam King <47704447+adk3798@users.noreply.github.com>
Fri, 17 Feb 2023 13:37:32 +0000 (08:37 -0500)
committer GitHub <noreply@github.com>
Fri, 17 Feb 2023 13:37:32 +0000 (08:37 -0500)
diff --cc src/pybind/mgr/cephadm/inventory.py
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Fri, 17 Feb 2023 13:37:32 +0000 (08:37 -0500)
committer	GitHub <noreply@github.com>
	Fri, 17 Feb 2023 13:37:32 +0000 (08:37 -0500)
		1	2
src/pybind/mgr/cephadm/inventory.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history