Merge PR #70607 into umbrella

author Patrick Donnelly <pdonnell@ibm.com>

Wed, 29 Jul 2026 13:14:44 +0000 (09:14 -0400)

committer Patrick Donnelly <pdonnell@ibm.com>

Wed, 29 Jul 2026 13:14:44 +0000 (09:14 -0400)
author Patrick Donnelly <pdonnell@ibm.com>
Wed, 29 Jul 2026 13:14:44 +0000 (09:14 -0400)
committer Patrick Donnelly <pdonnell@ibm.com>
Wed, 29 Jul 2026 13:14:44 +0000 (09:14 -0400)
diff --cc src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2
Simple merge
diff --cc src/pybind/mgr/cephadm/tests/services/test_nvmeof.py
Simple merge
diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge
author	Patrick Donnelly <pdonnell@ibm.com>
	Wed, 29 Jul 2026 13:14:44 +0000 (09:14 -0400)
committer	Patrick Donnelly <pdonnell@ibm.com>
	Wed, 29 Jul 2026 13:14:44 +0000 (09:14 -0400)
		1	2
src/pybind/mgr/cephadm/templates/services/nvmeof/ceph-nvmeof.conf.j2	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/tests/services/test_nvmeof.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/python-common/ceph/deployment/service_spec.py	patch \|	diff1 \|	diff2 \|	blob \| history