]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #24981 from alfredodeza/luminous-bz1644265
authorAlfredo Deza <alfredo@deza.pe>
Fri, 9 Nov 2018 14:07:22 +0000 (09:07 -0500)
committerGitHub <noreply@github.com>
Fri, 9 Nov 2018 14:07:22 +0000 (09:07 -0500)
luminous ceph-volume util.encryption robust blkid+lsblk detection of lockbox

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

Trivial merge