]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #34146 into master
authorSage Weil <sage@redhat.com>
Wed, 25 Mar 2020 21:44:17 +0000 (16:44 -0500)
committerSage Weil <sage@redhat.com>
Wed, 25 Mar 2020 21:44:17 +0000 (16:44 -0500)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py

Simple merge