From: Sage Weil <sage@redhat.com>
Date: Tue, 10 Mar 2020 03:42:05 +0000 (-0500)
Subject: Merge PR #33825 into octopus
X-Git-Tag: v15.1.1~53
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=691b44810e83bb3bceced1ded512857d1f579125;p=ceph-ci.git

Merge PR #33825 into octopus

* refs/pull/33825/head:
	cephadm: bootstrap: tolerate error return from -h
	ceph.in: only shut down rados on clean exit

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

691b44810e83bb3bceced1ded512857d1f579125