]> 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: 9212d76 217ddfe)
Merge PR #40242 into master
authorSage Weil <sage@newdream.net>
Fri, 19 Mar 2021 20:42:14 +0000 (16:42 -0400)
committerSage Weil <sage@newdream.net>
Fri, 19 Mar 2021 20:42:14 +0000 (16:42 -0400)
commit9183d96e936d7b783544523841106d385f59314d
tree53f3c738607726ecc50649338e7c4fb30316a8c4tree | snapshot
parent9212d7696aa508aa28d4b52aec3ec6b2324e4c25commit | diff
parent217ddfeb22ad52f1443bc585c044140d9bf07328commit | diff
Merge PR #40242 into master

* refs/pull/40242/head:
mgr/cephadm/upgrade: do not repeat crash message
mgr/cephadm/upgrade: a little less verbose
mgr/cephadm: don't log not-ok-to-stop at ERR level
mgr/cephadm: is presumed -> appears
mgr/cephadm: don't double-log ok-to-stop results
mgr/cephadm/upgrade: include upgrade progress in ceph -s

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/pybind/mgr/cephadm/services/cephadmservice.py diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.