pre-releasev2_02_153

5 files changed, 17 insertions, 7 deletions

diff --git a/VERSION b/VERSION
index 680848d38..790964516 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.153(2)-git (2016-04-30)
+2.02.153(2)-git (2016-05-07)
diff --git a/VERSION_DM b/VERSION_DM
index 1eb63a8c4..17bcab08d 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.125-git (2016-04-30)
+1.02.124-git (2016-05-07)
diff --git a/WHATS_NEW b/WHATS_NEW
index c8cee7648..721d8b7c0 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,5 @@
-Version 2.02.153 - 
-==================================
+Version 2.02.153 - 7th May 2016
+===============================
   Change warning messages related to duplicate PVs.
   A named device is always processed itself, not switched for a duplicate.
   Add PV attr "d" and report field "duplicate" for duplicate PVs.
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index f6392efda..24561d404 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,6 +1,3 @@
-Version 1.02.125 - 
-==================================
-
 Version 1.02.124 - 30th April 2016
 ==================================
   Add dm_udev_wait_immediate to libdevmapper for waiting outside the library.
diff --git a/conf/example.conf.in b/conf/example.conf.in
index a6a6762b4..c34481e9b 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -299,6 +299,19 @@ devices {
 	# generally do. If enabled, discards will only be issued if both the
 	# storage and kernel provide support.
 	issue_discards = 0
+
+	# Configuration option devices/allow_changes_with_duplicate_pvs.
+	# Allow VG modification while a PV appears on multiple devices.
+	# When a PV appears on multiple devices, LVM attempts to choose the
+	# best device to use for the PV. If the devices represent the same
+	# underlying storage, the choice has minimal consequence. If the
+	# devices represent different underlying storage, the wrong choice
+	# can result in data loss if the VG is modified. Disabling this
+	# setting is the safest option because it prevents modifying a VG
+	# or activating LVs in it while a PV appears on multiple devices.
+	# Enabling this setting allows the VG to be used as usual even with
+	# uncertain devices.
+	allow_changes_with_duplicate_pvs = 0
 }
 
 # Configuration section allocation.