From: Sage Weil <sage@redhat.com>
Date: Fri, 16 Aug 2019 16:39:13 +0000 (-0500)
Subject: Merge PR #29548 into master
X-Git-Tag: v15.1.0~1854
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3d295cb407b9f3ba5d9071d92498b5e613cec371;p=ceph-ci.git

Merge PR #29548 into master

* refs/pull/29548/head:
	osd: add device_id to list_devices to help get smart info easily

Reviewed-by: Sage Weil <sage@redhat.com>
---

3d295cb407b9f3ba5d9071d92498b5e613cec371