]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c553763 1b5a068)
Merge PR #40322 into master
authorSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 00:15:11 +0000 (20:15 -0400)
committerSage Weil <sage@newdream.net>
Wed, 24 Mar 2021 00:15:11 +0000 (20:15 -0400)
* refs/pull/40322/head:
cephadm: only bootstrap using image that matches cephadm version

Reviewed-by: Adam King <adking@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.