From: Sage Weil Date: Fri, 7 Feb 2020 19:26:54 +0000 (-0600) Subject: Merge PR #33119 into master X-Git-Tag: v15.1.1~511 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b74141bac688158f5ec881224b8062e8dc344d55;p=ceph-ci.git Merge PR #33119 into master * refs/pull/33119/head: mgr/upgrade: fix mgr self check mgr/cephadm: fail upgrade if target image doesn't exist mgr/cephadm: factor upgrade failure into helper mgr/cephadm: refresh if we don't know a daemon's image_id mgr/cephadm: refresh services in upgrade loop mgr/cephadm: clean up upgrade messages a bit Reviewed-by: Sebastian Wagner --- b74141bac688158f5ec881224b8062e8dc344d55