]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #32794 into master
authorSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 14:12:49 +0000 (08:12 -0600)
committerSage Weil <sage@redhat.com>
Thu, 23 Jan 2020 14:12:49 +0000 (08:12 -0600)
commit3e7d1981d4080a0c69465e47394be368f279457f
tree3e275a5d2787d13168a214847002bd9b48345fff
parent1a950cd5ec3dd09f3d0eeaebd531552dc0ef92c0
parentf0049916a1ae45ebb76fc67e3db37201ccfce1e8
Merge PR #32794 into master

* refs/pull/32794/head:
cephadm: normalize image_id in 'pull' output too
cephadm: fix image_id normalization
cephadm: pull: remove newline from ceph_version
mgr/cephadm: base upgrade check on return code, not stderr
mgr/cephadm: fix ok-to-stop
mgr/cephadm: some upgrade debug output
mgr/cephadm: remove dup check
mgr/cephadm: only need_upgrade_self if image_id doesn't match
mgr/cephadm: safe to restart mgr and other non-mon/osd/mds daemons

Reviewed-by: Michael Fritch <mfritch@suse.com>