From: Sage Weil Date: Fri, 4 Jan 2019 02:11:11 +0000 (-0600) Subject: Merge PR #25672 into master X-Git-Tag: v14.1.0~499 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c46f7b51f5101f57d382554130ea4ce78961b94;p=ceph.git Merge PR #25672 into master * 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 --- 8c46f7b51f5101f57d382554130ea4ce78961b94