From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Mar 2020 14:58:55 +0000 (-0500)
Subject: Merge PR #34186 into octopus
X-Git-Tag: v15.2.1~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0ab6fb8587c315c034546fb178786a7e2b01679;p=ceph.git

Merge PR #34186 into octopus

* refs/pull/34186/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>
---

c0ab6fb8587c315c034546fb178786a7e2b01679