From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Mar 2020 21:44:17 +0000 (-0500)
Subject: Merge PR #34146 into master
X-Git-Tag: v16.1.0~2797
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5fe37897e3dd35d5799e5beeb5fab207c20c36b;p=ceph.git

Merge PR #34146 into master

* refs/pull/34146/head:
	mgr/cephadm: use docker.io in default container image name
	mgr/cephadm: fix 'upgrade start' message when specifying a version

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

a5fe37897e3dd35d5799e5beeb5fab207c20c36b