From: Alfredo Deza <alfredo@deza.pe>
Date: Fri, 9 Nov 2018 14:07:22 +0000 (-0500)
Subject: Merge pull request #24981 from alfredodeza/luminous-bz1644265
X-Git-Tag: v12.2.10~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6a1ee461c2cf2899316dd84572536f2cb3df14b;p=ceph.git

Merge pull request #24981 from alfredodeza/luminous-bz1644265

luminous ceph-volume util.encryption robust blkid+lsblk detection of lockbox

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
---

f6a1ee461c2cf2899316dd84572536f2cb3df14b