From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Nov 2019 15:41:19 +0000 (-0600)
Subject: Merge PR #31445 into master
X-Git-Tag: v15.1.0~1004
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=419965a52bf0b3507183368b7e8630cbb55fc370;p=ceph.git

Merge PR #31445 into master

* refs/pull/31445/head:
	ceph-daemon: set container_image during bootstrap

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

419965a52bf0b3507183368b7e8630cbb55fc370