From: Sage Weil <sage@redhat.com>
Date: Fri, 22 Mar 2019 09:52:25 +0000 (-0500)
Subject: Merge PR #27020 into master
X-Git-Tag: v15.0.0~140
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2fc26c09127853e78db57920313c598c29f3e671;p=ceph.git

Merge PR #27020 into master

* refs/pull/27020/head:
	common/blkdev: handle devices with ID_MODEL as "LVM PV ..." but valid ID_MODEL_ENC

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

2fc26c09127853e78db57920313c598c29f3e671