]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #29548 into master
authorSage Weil <sage@redhat.com>
Fri, 16 Aug 2019 16:39:13 +0000 (11:39 -0500)
committerSage Weil <sage@redhat.com>
Fri, 16 Aug 2019 16:39:13 +0000 (11:39 -0500)
* refs/pull/29548/head:
osd: add device_id to list_devices to help get smart info easily

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/osd/OSD.cc

diff --cc src/osd/OSD.cc
Simple merge