From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Mar 2019 18:08:56 +0000 (-0500)
Subject: Merge PR #27156 into master
X-Git-Tag: v15.0.0~101
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5118df1da1a8ef2c4b48584e958c10b2a5bf4506;p=ceph-ci.git

Merge PR #27156 into master

* refs/pull/27156/head:
	common/blkdev: get_device_id: behave if model is lvm and id_model_enc isn't there

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

5118df1da1a8ef2c4b48584e958c10b2a5bf4506