From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Mar 2020 21:43:33 +0000 (-0600)
Subject: Merge PR #33678 into master
X-Git-Tag: v15.1.1~144
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=023497df6d38a4cfdce7dd2a8a9f92363cf57b5c;p=ceph.git

Merge PR #33678 into master

* refs/pull/33678/head:
	mgr/cephadm: fix upgrade when daemon is stopped

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

023497df6d38a4cfdce7dd2a8a9f92363cf57b5c