]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cb0da0 d9f9a69)
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)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.