]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commita5fe37897e3dd35d5799e5beeb5fab207c20c36b
tree7a22bfc3b30cc36c8132f982f1acc22e784dd059
parent3946827814ec686a9e3b97dc8eb2ff1b5f5c54cf
parentd4f367a7ea96c97c7aa437f79a1c2dabb2c7caf8
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>
src/pybind/mgr/cephadm/module.py