Merge pull request #48391 from adk3798/iscsi-ports

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

Wed, 7 Dec 2022 15:22:42 +0000 (10:22 -0500)

committer GitHub <noreply@github.com>

Wed, 7 Dec 2022 15:22:42 +0000 (10:22 -0500)
author Adam King <47704447+adk3798@users.noreply.github.com>
Wed, 7 Dec 2022 15:22:42 +0000 (10:22 -0500)
committer GitHub <noreply@github.com>
Wed, 7 Dec 2022 15:22:42 +0000 (10:22 -0500)
diff --cc src/cephadm/cephadm.py
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge
diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge
author	Adam King <47704447+adk3798@users.noreply.github.com>
	Wed, 7 Dec 2022 15:22:42 +0000 (10:22 -0500)
committer	GitHub <noreply@github.com>
	Wed, 7 Dec 2022 15:22:42 +0000 (10:22 -0500)
		1	2
src/cephadm/cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/test_services.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/python-common/ceph/deployment/service_spec.py	patch \|	diff1 \|	diff2 \|	blob \| history