From: Sage Weil <sage@redhat.com>
Date: Tue, 11 Feb 2020 01:53:37 +0000 (-0600)
Subject: Merge PR #33190 into master
X-Git-Tag: v15.1.1~478
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d760b2787be81a83e7b43eb680b8a4eda8004bb2;p=ceph.git

Merge PR #33190 into master

* refs/pull/33190/head:
	cephadm: report image name for stopped daemons
	cephadm: record the image name to unit.image

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

d760b2787be81a83e7b43eb680b8a4eda8004bb2