]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33808 into master
authorSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 13:28:37 +0000 (08:28 -0500)
committerSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 13:28:37 +0000 (08:28 -0500)
* refs/pull/33808/head:
mgr/cephadm: apply: fill in default placement if none is provided
mgr/cephadm: make placement truly optional (default to count=1)
mgr/cephadm: allow count == 0
mgr/cephadm: remove magic labels

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py

Simple merge