]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8b2c6e 0108b7c)
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)
* 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>
1  2 
src/pybind/mgr/cephadm/module.py patch | diff1 | diff2 | blob | history

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.