From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Dec 2019 21:48:47 +0000 (-0600)
Subject: Merge PR #32157 into master
X-Git-Tag: v15.1.0~546
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2af551872e52cd7c40f48b7e9aac4ef916c37a5;p=ceph.git

Merge PR #32157 into master

* refs/pull/32157/head:
	ceph-daemon: fix pod stop

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
---

a2af551872e52cd7c40f48b7e9aac4ef916c37a5