Merge pull request #55068 from phlogistonjohn/jjm-cephadm-smb-svc-spec

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

Mon, 25 Mar 2024 20:24:54 +0000 (16:24 -0400)

committer GitHub <noreply@github.com>

Mon, 25 Mar 2024 20:24:54 +0000 (16:24 -0400)
author Adam King <47704447+adk3798@users.noreply.github.com>
Mon, 25 Mar 2024 20:24:54 +0000 (16:24 -0400)
committer GitHub <noreply@github.com>
Mon, 25 Mar 2024 20:24:54 +0000 (16:24 -0400)
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>
	Mon, 25 Mar 2024 20:24:54 +0000 (16:24 -0400)
committer	GitHub <noreply@github.com>
	Mon, 25 Mar 2024 20:24:54 +0000 (16:24 -0400)
		1	2
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