Merge pull request #35537 from sebastian-philipp/cephadm-yaml-ordered-readable

author Sebastian Wagner <sebastian.wagner@suse.com>

Thu, 25 Jun 2020 18:06:25 +0000 (20:06 +0200)

committer GitHub <noreply@github.com>

Thu, 25 Jun 2020 18:06:25 +0000 (20:06 +0200)
author Sebastian Wagner <sebastian.wagner@suse.com>
Thu, 25 Jun 2020 18:06:25 +0000 (20:06 +0200)
committer GitHub <noreply@github.com>
Thu, 25 Jun 2020 18:06:25 +0000 (20:06 +0200)
diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge
diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge
diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Thu, 25 Jun 2020 18:06:25 +0000 (20:06 +0200)
committer	GitHub <noreply@github.com>
	Thu, 25 Jun 2020 18:06:25 +0000 (20:06 +0200)
		1	2
src/pybind/mgr/cephadm/tests/test_cephadm.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/orchestrator/_interface.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/python-common/ceph/deployment/service_spec.py	patch \|	diff1 \|	diff2 \|	blob \| history