]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #43138 into master
authorSage Weil <sage@newdream.net>
Wed, 20 Oct 2021 21:50:21 +0000 (17:50 -0400)
committerSage Weil <sage@newdream.net>
Wed, 20 Oct 2021 21:50:21 +0000 (17:50 -0400)
* refs/pull/43138/head:
mgr/rook: implement `orch device zap` in rook orchestrator

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
1  2 
src/pybind/mgr/rook/module.py
src/pybind/mgr/rook/rook_cluster.py

Simple merge
Simple merge