From: Sage Weil Date: Fri, 19 Mar 2021 20:42:14 +0000 (-0400) Subject: Merge PR #40242 into master X-Git-Tag: v17.1.0~2550 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9183d96e936d7b783544523841106d385f59314d;p=ceph.git 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 --- 9183d96e936d7b783544523841106d385f59314d