]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3df04b8 990a6af)
Merge PR #42535 into master
authorSage Weil <sage@newdream.net>
Mon, 9 Aug 2021 23:33:52 +0000 (19:33 -0400)
committerSage Weil <sage@newdream.net>
Mon, 9 Aug 2021 23:33:52 +0000 (19:33 -0400)
* refs/pull/42535/head:
mgr/cephadm: quay.io for non-ceph images too
mgr/cephadm: DEFAULT_IMAGE from quay, not docker
doc/install/containers: quay.io!

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Reviewed-by: Dimitri Savineau <dsavinea@redhat.com>
1  2 
src/cephadm/cephadm patch | diff1 | diff2 | blob | history

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