From: Sage Weil <sage@redhat.com>
Date: Fri, 21 Feb 2020 20:41:59 +0000 (-0600)
Subject: Merge PR #33457 into master
X-Git-Tag: v15.1.1~316
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6c47044a7cfb2562f3fcb434372da04c3a52ae9f;p=ceph.git

Merge PR #33457 into master

* refs/pull/33457/head:
	qa/workunits/cephadm: separate out test_adoption.sh; fix

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

6c47044a7cfb2562f3fcb434372da04c3a52ae9f