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

Merge PR #32178 into master

* refs/pull/32178/head:
	qa/standalone/test_ceph_daemon.sh: disable adoption for the moment

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

3398379af8dd71cf19d57e50cae583c5ae830bee