From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Nov 2019 17:30:29 +0000 (-0600)
Subject: Merge PR #31437 into master
X-Git-Tag: v15.1.0~1017
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7328fa4dcf9b64b38bd90dd93725828b1070cc10;p=ceph.git

Merge PR #31437 into master

* refs/pull/31437/head:
	ceph-daemon: Remove data dir during adopt

Reviewed-by: Sage Weil <sage@redhat.com>
---

7328fa4dcf9b64b38bd90dd93725828b1070cc10