]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #25672 into master
authorSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 02:11:11 +0000 (20:11 -0600)
committerSage Weil <sage@redhat.com>
Fri, 4 Jan 2019 02:11:11 +0000 (20:11 -0600)
* refs/pull/25672/head:
osd: OSD device smart data include additional nvme data
common/blkdev: add missing get_device_id impl
os/bluestore,filestore: use get_raw_devices
osd: update metadata and smart code to report get_device_id errors
mon: update metadata and smart commands to use get_raw_devices
common/blkdev: add get_raw_devices helper
common/blkdev: fix BlkDev::get_devid when we got a devname, not fd
common/blkdev: return optional error string from get_device_id
common/blkdev: refactor to add block_device_get_metrics returning json

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/mon/Monitor.cc
src/os/bluestore/KernelDevice.cc
src/osd/OSD.cc

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