From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Feb 2020 20:40:51 +0000 (-0600)
Subject: Merge PR #33487 into master
X-Git-Tag: v15.1.1~280
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d09e114c02f8dd60089c2ece8606680ec891f7d5;p=ceph.git

Merge PR #33487 into master

* refs/pull/33487/head:
	mgr/cephadm: upgrade: fix handling when target container id changes
	mgr/cephadm: upgrade: handle stopped daemons

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

d09e114c02f8dd60089c2ece8606680ec891f7d5