From: Sage Weil <sage@redhat.com>
Date: Thu, 23 Jan 2020 14:12:49 +0000 (-0600)
Subject: Merge PR #32794 into master
X-Git-Tag: v15.1.0~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e7d1981d4080a0c69465e47394be368f279457f;p=ceph.git

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>
---

3e7d1981d4080a0c69465e47394be368f279457f