[lvm-devel] master - Merge branch 'master' of git+ssh://sourceware.org/git/lvm2

[Joe Thornber]

Gitweb:        https://sourceware.org/git/?p=lvm2.git;a=commitdiff;h=db0560c1b0e63bff7c696488cee338653f02545a
Commit:        db0560c1b0e63bff7c696488cee338653f02545a
Parent:        1553993ea1e28222704ac90e1765eef86ea9eff1 39f05855c0f985a20951cd3394d97c166dd9af5d
Author:        Joe Thornber <ejt at redhat.com>
AuthorDate:    Tue May 1 20:04:30 2018 +0100
Committer:     Joe Thornber <ejt at redhat.com>
CommitterDate: Tue May 1 20:04:30 2018 +0100

Merge branch 'master' of git+ssh://sourceware.org/git/lvm2


 lib/cache/lvmcache.c           |    2 +-
 lib/label/label.c              |   18 +++++++++++++-
 test/shell/lvmetad-disabled.sh |   24 +++++++++++++++----
 test/shell/pool-labels.sh      |   48 ----------------------------------------
 test/shell/vgcreate-usage.sh   |    4 ---
 5 files changed, 36 insertions(+), 60 deletions(-)