From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Dec 2019 22:26:33 +0000 (-0600)
Subject: Merge PR #31913 into master
X-Git-Tag: v15.1.0~698
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c1235ba6986256dd810af48d034176b33878606;p=ceph.git

Merge PR #31913 into master

* refs/pull/31913/head:
	ceph-daemon: Allow env var for setting the used image

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

2c1235ba6986256dd810af48d034176b33878606