]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #32983 into master
authorSage Weil <sage@redhat.com>
Fri, 28 Feb 2020 01:44:54 +0000 (19:44 -0600)
committerSage Weil <sage@redhat.com>
Fri, 28 Feb 2020 01:44:54 +0000 (19:44 -0600)
* refs/pull/32983/head:
mgr/cephadm: remove/replace osds

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

Simple merge
Simple merge
Simple merge