From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Mar 2019 18:10:27 +0000 (-0500)
Subject: Merge PR #27158 into nautilus
X-Git-Tag: v14.2.1~110
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8b86bc325e2e1f110e8675e15cf4cafce100783;p=ceph.git

Merge PR #27158 into nautilus

* refs/pull/27158/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>
---

c8b86bc325e2e1f110e8675e15cf4cafce100783