]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33706 into master
authorSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 19:45:16 +0000 (13:45 -0600)
committerSage Weil <sage@redhat.com>
Sat, 7 Mar 2020 19:45:16 +0000 (13:45 -0600)
commitb38771f45fc7a3d77f1bea5a8046aec71d855461
tree238ab620e83fdc1c1a9355477da03ae6c652642e
parentcb12759b8145b6489e41fec609bacdd949a99bdf
parentbfb03adbe6f879152d894f59bbfad8c51a477307
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>