From: Sage Weil <sage@redhat.com>
Date: Tue, 5 Nov 2019 15:28:32 +0000 (-0600)
Subject: Merge PR #31365 into master
X-Git-Tag: v15.1.0~1030
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f5762cc984e38f9d672b467abfe6f66667d5e0b5;p=ceph-ci.git

Merge PR #31365 into master

* 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>
---

f5762cc984e38f9d672b467abfe6f66667d5e0b5