]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #33973 into octopus
authorSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 02:01:07 +0000 (21:01 -0500)
committerSage Weil <sage@redhat.com>
Mon, 16 Mar 2020 02:01:07 +0000 (21:01 -0500)
commit334dede19883a5b99b2d65bfce037d360518d9f0
tree95f6ceca62a34ee3ec0156f61fc2f7f90c19ed53
parent05b8f07313a249d30f78b422fc17353e44fb8359
parent903f4590c3dcc21c93460925ff8ac7526703166d
Merge PR #33973 into octopus

* refs/pull/33973/head:
mgr/orch,cephadm: elevate --force flag for daemons to interface
cephadm: backup data when we remove stateful daemons (mon, osd, prometheus)
cephadm: do not zap disk after removing an OSD daemon

Reviewed-by: Michael Fritch <mfritch@suse.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/orchestrator/_interface.py
src/pybind/mgr/test_orchestrator/module.py