From: Sage Weil <sage@redhat.com>
Date: Wed, 6 Nov 2019 15:46:36 +0000 (-0600)
Subject: Merge PR #31440 into master
X-Git-Tag: v15.1.0~1018
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e326dfbc6128829a124f2fc9b38528ddc137e345;p=ceph-ci.git

Merge PR #31440 into master

* refs/pull/31440/head:
	qa/standalone/test_ceph_daemon: Make container images configurable
	qa/standalone/test_ceph_daemon: Allow running from root dir
	qa/standalone/test_ceph_daemon: Fix hang when CEPH_DAEMON is not set

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

e326dfbc6128829a124f2fc9b38528ddc137e345