]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #31365 into master
authorSage Weil <sage@redhat.com>
Tue, 5 Nov 2019 15:28:32 +0000 (09:28 -0600)
committerSage Weil <sage@redhat.com>
Tue, 5 Nov 2019 15:28:32 +0000 (09:28 -0600)
* refs/pull/31365/head:
ceph-daemon: make rm-daemon reset-failed
ceph-daemon: make rm-cluster handle failed unit cleanup

Reviewed-by: Sebastian Wagner <swagner@suse.com>
1  2 
src/ceph-daemon

diff --cc src/ceph-daemon
Simple merge