]> 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: 5b4a766 2580de1)
Merge PR #40324 into master
authorSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 02:58:05 +0000 (22:58 -0400)
committerSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 02:58:05 +0000 (22:58 -0400)
* refs/pull/40324/head:
mgr/cephadm/upgrade: do not crash if error races with user cancellation

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/pybind/mgr/cephadm/upgrade.py patch | diff1 | diff2 | blob | history

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