]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 542b81b e07a738)
Merge PR #40577 into master
authorSage Weil <sage@newdream.net>
Sat, 10 Apr 2021 13:01:58 +0000 (09:01 -0400)
committerSage Weil <sage@newdream.net>
Sat, 10 Apr 2021 13:01:58 +0000 (09:01 -0400)
* refs/pull/40577/head:
cephadm: normalize unqualified repo digests to docker.io
mgr/cephadm/upgrade: normalize unqualified target image

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history
src/pybind/mgr/cephadm/upgrade.py patch | diff1 | diff2 | blob | history

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