Merge pull request #36239 from sebastian-philipp/cephadm-parallel-hosts

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

Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)

committer GitHub <noreply@github.com>

Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)
author Sebastian Wagner <sebastian.wagner@suse.com>
Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)
committer GitHub <noreply@github.com>
Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)
diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
diff --cc src/pybind/mgr/cephadm/services/osd.py
Simple merge
author	Sebastian Wagner <sebastian.wagner@suse.com>
	Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)
committer	GitHub <noreply@github.com>
	Thu, 23 Jul 2020 15:53:31 +0000 (17:53 +0200)
		1	2
src/pybind/mgr/cephadm/module.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/pybind/mgr/cephadm/services/osd.py	patch \|	diff1 \|	diff2 \|	blob \| history