]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #33119 into master
authorSage Weil <sage@redhat.com>
Fri, 7 Feb 2020 19:26:54 +0000 (13:26 -0600)
committerSage Weil <sage@redhat.com>
Fri, 7 Feb 2020 19:26:54 +0000 (13:26 -0600)
* 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 <swagner@suse.com>

Trivial merge