From: Sage Weil <sage@redhat.com>
Date: Thu, 5 Mar 2020 19:18:34 +0000 (-0600)
Subject: Merge PR #33745 into master
X-Git-Tag: v15.1.1~98
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eb58e5bba8b6bab75508178b572ec01e51426cb;p=ceph.git

Merge PR #33745 into master

* refs/pull/33745/head:
	mgr/cephadm: upgrade: fix daemons missing image_id

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

8eb58e5bba8b6bab75508178b572ec01e51426cb