From: Sage Weil <sage@redhat.com>
Date: Sat, 14 Mar 2020 15:52:05 +0000 (-0500)
Subject: Merge PR #33922 into octopus
X-Git-Tag: v15.2.0~50
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbeefb2c10795aa2641c71dae537472bbe61874f;p=ceph.git

Merge PR #33922 into octopus

* refs/pull/33922/head:
	qa/tasks/mgr/test_orchestrator_cli: adapt
	qa/suites/rados/cephadm/upgrade: start from compatible build
	mgr/cephadm: refine log message
	python-common: correctly dictify DriveGroupSpec objects when paths are used
	mgr/cephadm: adapt test_cephadm.sh to new syntax
	mgr/cephadm: adapt qa->test_cephadm.sh
	qa/tasks/cephadm: use 'orch daemon osd add'
	mgr/cephadm: adapt osd deployment to service_apply

Reviewed-by: Sage Weil <sage@redhat.com>
---

bbeefb2c10795aa2641c71dae537472bbe61874f