From: Sage Weil <sage@redhat.com>
Date: Sat, 7 Mar 2020 19:45:16 +0000 (-0600)
Subject: Merge PR #33706 into master
X-Git-Tag: v15.1.1~74
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b38771f45fc7a3d77f1bea5a8046aec71d855461;p=ceph-ci.git

Merge PR #33706 into master

* refs/pull/33706/head:
	qa/suites/rados/cephadm/upgrade: adjust starting version
	mgr/orch: from_strings -> from_string; do not accept a list
	mgr/volumes: pass placement as string, not list
	qa/tasks/mgr/test_orchestrator_cli: adjust placement args
	qa/tasks/cephadm: pass apply placement as a single arg
	mgr/orch: PlacementSpec: allow 'count:123'
	mgr/orch: PlacementSpec: may pretty_str() match input
	mgr/orch: take single placement argument
	mgr/orch: PlacementSpec.from_strings: take a string *or* a list

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

b38771f45fc7a3d77f1bea5a8046aec71d855461