From: Sage Weil <sage@redhat.com>
Date: Sun, 24 Mar 2019 15:29:34 +0000 (-0500)
Subject: Merge PR #27096 into nautilus
X-Git-Tag: v14.2.1~115
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d40d9e6d74fafded0b97016daca241144ca40f3e;p=ceph.git

Merge PR #27096 into nautilus

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

Reviewed-by: Neha Ojha <nojha@redhat.com>
---

d40d9e6d74fafded0b97016daca241144ca40f3e