]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #33487 into master
authorSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:40:51 +0000 (14:40 -0600)
committerSage Weil <sage@redhat.com>
Mon, 24 Feb 2020 20:40:51 +0000 (14:40 -0600)
commitd09e114c02f8dd60089c2ece8606680ec891f7d5
treee6f5f2fa5675d39cdc99df41be1a7e30f9d5bdb1
parent1cb0da00051c5b46245d5cc2357077c0b20dca4f
parentd9f9a69ab2cb7197e309dbbe0947d0800703fb2c
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>
src/pybind/mgr/cephadm/module.py