From: Sage Weil <sage@redhat.com>
Date: Tue, 22 Oct 2019 20:27:14 +0000 (-0500)
Subject: Merge PR #31060 into master
X-Git-Tag: v15.1.0~1197
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=732596e6518876df8f8659d40a285598ee828b60;p=ceph.git

Merge PR #31060 into master

* refs/pull/31060/head:
	ceph-daemon: make rm-cluster clear out previously failed units
	ceph-daemon: fix get_config_and_both_keyrings() return value
---

732596e6518876df8f8659d40a285598ee828b60