]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf10c752966fd1c25c0758e5a1a15c44750da5218
tree71facc5c77722c2fceee16990d011231fd4de2detree | snapshot
parent5b4a7668f195c3f5f33ec05d13c17b83d3032ceecommit | diff
parent2580de1a5db476b01093a269056d2f5bd0cc3d75commit | diff
Merge PR #40324 into master

* 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>
src/pybind/mgr/cephadm/upgrade.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.