summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlasdair G Kergon <agk@redhat.com>2016-04-23 00:33:59 +0100
committerAlasdair G Kergon <agk@redhat.com>2016-04-23 00:41:55 +0100
commit546b2006dd4bc888a08631d6cb66245b0374eab2 (patch)
tree6ec33d50ed1f76593af3bf223e080dd47ae08bb5
parent31b11d02281a3d141fa2c69d9155baacd158bf50 (diff)
downloadlvm2-546b2006dd4bc888a08631d6cb66245b0374eab2.tar.gz
pre-releasev2_02_151
-rw-r--r--VERSION2
-rw-r--r--VERSION_DM2
-rw-r--r--WHATS_NEW4
-rw-r--r--WHATS_NEW_DM5
-rw-r--r--conf/example.conf.in7
5 files changed, 15 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 4731ad068..3af3f8c54 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.151(2)-git (2016-04-09)
+2.02.151(2)-git (2016-04-23)
diff --git a/VERSION_DM b/VERSION_DM
index 359ada76f..74d6f61a5 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.123-git (2016-04-09)
+1.02.123-git (2016-04-23)
diff --git a/WHATS_NEW b/WHATS_NEW
index d08856097..bf72aaa89 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,5 @@
-Version 2.02.151 -
-=================================
+Version 2.02.151 - 23rd April 2016
+==================================
Fix error path after reusing of _setup_task (2.02.150).
Fix memory access for empty sysfs values (2.02.149).
Disable lvmetad when lvm1 metadata is seen, so commands revert to scanning.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index e2301eabd..3c1ca53e8 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,6 +1,9 @@
+Version 1.02.123 - 23rd April 2016
+==================================
+ Do not strip LVM- when debug reporting not found uuid.
+
Version 1.02.122 - 9th April 2016
=================================
- Do not strip LVM- when debug reporting not found uuid.
Change log_debug ioctl flags from single characters into words.
Version 1.02.121 - 26th March 2016
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 255d32959..a6a6762b4 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -851,6 +851,13 @@ global {
# devices/global_filter.
use_lvmetad = @DEFAULT_USE_LVMETAD@
+ # Configuration option global/lvmetad_update_wait_time.
+ # The number of seconds a command will wait for lvmetad update to finish.
+ # After waiting for this period, a command will not use lvmetad, and
+ # will revert to disk scanning.
+ # This configuration option has an automatic default value.
+ # lvmetad_update_wait_time = 10
+
# Configuration option global/use_lvmlockd.
# Use lvmlockd for locking among hosts using LVM on shared storage.
# Applicable only if LVM is compiled with lockd support in which