]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #34186 into octopus
authorSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 14:58:55 +0000 (09:58 -0500)
committerSage Weil <sage@redhat.com>
Thu, 26 Mar 2020 14:58:55 +0000 (09:58 -0500)
commitc0ab6fb8587c315c034546fb178786a7e2b01679
tree715dca3ab1c3c843bdd5e8bafa9d17fa4681d2c7
parentb8b2c6ef1486f110f1b92d0c4af62cc10ad98b8f
parent0108b7c3dcab60ef664e0ce1f3dc28d1a4d53467
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>
src/pybind/mgr/cephadm/module.py