[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=f6eeb218b20685b1bf0f76b24c5697901896bdec
Commit:        f6eeb218b20685b1bf0f76b24c5697901896bdec
Parent:        891f8dc19d7b9c5a72971200fad2b29b13e43bfa 1140d70893e4f246a46fa360d20838ceafa690ec
Author:        Joe Thornber <ejt at redhat.com>
AuthorDate:    Mon Jun 4 11:59:49 2018 +0100
Committer:     Joe Thornber <ejt at redhat.com>
CommitterDate: Mon Jun 4 11:59:49 2018 +0100

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


 daemons/lvmlockd/Makefile.in |    6 ++-
 daemons/lvmpolld/Makefile.in |    3 +-
 include/.gitignore           |    3 --
 include/Makefile.in          |   83 +++++++++++++++++++++++++++++++++++++++++-
 lib/activate/activate.h      |    2 +-
 lib/metadata/lv.c            |    2 +-
 6 files changed, 90 insertions(+), 9 deletions(-)