]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0b8dab a7c3290)
Merge PR #25382 into master
authorSage Weil <sage@redhat.com>
Thu, 6 Dec 2018 14:41:27 +0000 (08:41 -0600)
committerSage Weil <sage@redhat.com>
Thu, 6 Dec 2018 14:41:27 +0000 (08:41 -0600)
* refs/pull/25382/head:
mon/OSDMonitor: include host, container info for 'osd find' command

Reviewed-by: Dan Mick <dmick@redhat.com>
1  2 
src/mon/OSDMonitor.cc patch | diff1 | diff2 | blob | history

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