From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Feb 2020 03:40:23 +0000 (-0600)
Subject: Merge PR #33445 into master
X-Git-Tag: v15.1.1~339
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb1b96d50dfc42c70851e4840dca58575610727f;p=ceph.git

Merge PR #33445 into master

* refs/pull/33445/head:
	cephadm: fix adoption safety check

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

bb1b96d50dfc42c70851e4840dca58575610727f