From: Sage Weil <sage@redhat.com>
Date: Sat, 14 Dec 2019 04:03:45 +0000 (-0600)
Subject: Merge PR #32244 into master
X-Git-Tag: v15.1.0~499
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d915c8d0e2a61fabb02f660fef51346084b1bc7;p=ceph.git

Merge PR #32244 into master

* refs/pull/32244/head:
	qa/workunits/cephadm/test_cephadm.sh: re-enable `adopt` tests

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

2d915c8d0e2a61fabb02f660fef51346084b1bc7