]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #27158 into nautilus
authorSage Weil <sage@redhat.com>
Mon, 25 Mar 2019 18:10:27 +0000 (13:10 -0500)
committerSage Weil <sage@redhat.com>
Mon, 25 Mar 2019 18:10:27 +0000 (13:10 -0500)
* 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>

Trivial merge