]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1857746 97c7dcf)
Merge PR #33829 into octopus
authorSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 16:33:14 +0000 (11:33 -0500)
committerSage Weil <sage@redhat.com>
Thu, 12 Mar 2020 16:33:14 +0000 (11:33 -0500)
* refs/pull/33829/head:
cephadm: log when we infer the image
cephadm: Avoid `inspect` call by using ceph label
cephadm: Infer ceph image

Reviewed-by: Sage Weil <sage@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.