Merge branch 'master' into f21

Conflicts:
	lvm2.spec
This commit is contained in:
Alasdair G Kergon 2014-07-25 01:09:14 +01:00
commit f85d4c7f0e
6 changed files with 59 additions and 29 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/LVM2.2.02.105.tgz /LVM2.2.02.105.tgz
/LVM2.2.02.106.tgz /LVM2.2.02.106.tgz
/LVM2.2.02.107.tgz /LVM2.2.02.107.tgz
/LVM2.2.02.108.tgz

View File

@ -1,12 +1,6 @@
conf/example.conf.in | 2 +- --- LVM2.2.02.108/conf/example.conf.in 2014-07-23 16:21:02.000000000 +0100
lib/config/config_settings.h | 2 +- +++ LVM2.2.02.108-new/conf/example.conf.in 2014-07-23 23:11:03.000000000 +0100
2 files changed, 2 insertions(+), 2 deletions(-) @@ -695,7 +695,7 @@
diff --git a/conf/example.conf.in b/conf/example.conf.in
index 2ed3fd6..8618a3e 100644
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -667,7 +667,7 @@ global {
# supported in clustered environment. If use_lvmetad=1 and locking_type=3 # supported in clustered environment. If use_lvmetad=1 and locking_type=3
# is set at the same time, LVM always issues a warning message about this # is set at the same time, LVM always issues a warning message about this
# and then it automatically disables lvmetad use. # and then it automatically disables lvmetad use.
@ -15,11 +9,9 @@ index 2ed3fd6..8618a3e 100644
# Full path of the utility called to check that a thin metadata device # Full path of the utility called to check that a thin metadata device
# is in a state that allows it to be used. # is in a state that allows it to be used.
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h --- LVM2.2.02.108/lib/config/config_settings.h 2014-07-23 16:21:02.000000000 +0100
index 932ba2e..79917e5 100644 +++ LVM2.2.02.108-new/lib/config/config_settings.h 2014-07-23 23:11:03.000000000 +0100
--- a/lib/config/config_settings.h @@ -175,7 +175,7 @@
+++ b/lib/config/config_settings.h
@@ -173,7 +173,7 @@ cfg(global_metadata_read_only_CFG, "metadata_read_only", global_CFG_SECTION, 0,
cfg(global_mirror_segtype_default_CFG, "mirror_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_MIRROR_SEGTYPE, vsn(2, 2, 87), NULL) cfg(global_mirror_segtype_default_CFG, "mirror_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_MIRROR_SEGTYPE, vsn(2, 2, 87), NULL)
cfg(global_raid10_segtype_default_CFG, "raid10_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_RAID10_SEGTYPE, vsn(2, 2, 99), NULL) cfg(global_raid10_segtype_default_CFG, "raid10_segtype_default", global_CFG_SECTION, 0, CFG_TYPE_STRING, DEFAULT_RAID10_SEGTYPE, vsn(2, 2, 99), NULL)
cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_path", global_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_BOOL, DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH, vsn(2, 2, 89), NULL) cfg(global_lvdisplay_shows_full_device_path_CFG, "lvdisplay_shows_full_device_path", global_CFG_SECTION, CFG_PROFILABLE, CFG_TYPE_BOOL, DEFAULT_LVDISPLAY_SHOWS_FULL_DEVICE_PATH, vsn(2, 2, 89), NULL)

View File

@ -1,15 +1,11 @@
--- LVM2.2.02.58/conf/example.conf.in 2010-01-07 19:54:21.000000000 +0000 --- LVM2.2.02.108/conf/example.conf.in 2014-07-23 16:21:02.000000000 +0100
+++ LVM2.2.02.58-new/conf/example.conf.in 2010-01-20 18:30:32.000000000 +0000 +++ LVM2.2.02.108-new/conf/example.conf.in 2014-07-23 23:05:06.000000000 +0100
@@ -23,10 +23,10 @@ @@ -58,7 +58,7 @@
# same block device and the tools need to display a name for device, # preferred_names = [ ]
# all the pathnames are matched against each item in the following
# list of regular expressions in turn and the first match is used.
- preferred_names = [ ]
+ # preferred_names = [ ]
# Try to avoid using undescriptive /dev/dm-N names, if present. # Try to avoid using undescriptive /dev/dm-N names, if present.
- # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] - # preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
+ preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ] + preferred_names = [ "^/dev/mpath/", "^/dev/mapper/mpath", "^/dev/[hs]d" ]
# A filter that tells LVM2 to only use a restricted set of devices. # In case no prefererred name matches or if preferred_names are not
# The filter consists of an array of regular expressions. These # defined at all, builtin rules are used to determine the preference.

View File

@ -1,4 +1,4 @@
%define device_mapper_version 1.02.86 %define device_mapper_version 1.02.87
%define enable_cache 1 %define enable_cache 1
%define enable_cluster 1 %define enable_cluster 1
@ -39,8 +39,8 @@
Summary: Userland logical volume management tools Summary: Userland logical volume management tools
Name: lvm2 Name: lvm2
Version: 2.02.107 Version: 2.02.108
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
URL: http://sources.redhat.com/lvm2 URL: http://sources.redhat.com/lvm2
@ -638,6 +638,47 @@ the device-mapper event library.
%{_libdir}/pkgconfig/devmapper-event.pc %{_libdir}/pkgconfig/devmapper-event.pc
%changelog %changelog
* Wed Jul 23 2014 Alasdair Kergon <agk@redhat.com> - 2.02.108-1
- Remove an erroneous duplicate const from libdevmapper.h. (2.02.107)
- Add lvscan --cache which re-scans constituents of a particular LV.
- Make dmeventd's RAID plugin re-scan failed PVs when lvmetad is in use.
- Improve code sharing for lvconvert and lvcreate and pools (cache & thin).
- Improve lvconvert --merge validation.
- Improve lvconvert --splitsnapshot validation.
- Add report/list_item_separator lvm.conf option.
- Add lv_active_{locally,remotely,exclusively} LV reporting fields.
- Enhance lvconvert thin, thinpool, cache and cachepool command line support.
- Display 'C' only for cache and cache-pool target types in lvs.
- Prompt for confirmation before change LV into a snapshot exception store.
- Return proper error codes for some failing lvconvert funtions.
- Add initial code to use cache tools (cache_check|dump|repair|restore).
- Support lvdisplay --maps for raid.
- Add --activationmode degraded to activate degraded raid volumes by default.
- Add separate lv_active_{locally,remotely,exclusively} LV reporting fields.
- Recognize "auto"/"unmanaged" values in selection for appropriate fields only.
- Add report/binary_values_as_numeric lvm.conf option for binary values as 0/1.
- Add --binary arg to pvs,vgs,lvs and {pv,vg,lv}display -C for 0/1 on reports.
- Add separate reporting fields for each each {pv,vg,lv}_attr bit.
- Separate LV device status reporting fields out of LV fields.
- Fix regression causing PVs not in VGs to be marked as allocatable (2.02.59).
- Fix VG component of lvid in vgsplit/vgmerge and check in vg_validate.
- Add lv_full_name, lv_parent and lv_dm_path fields to reports.
- Change lv_path field to suppress devices that never appear in /dev/vg.
- Postpone thin pool lvconvert prompts (2.02.107).
- Require --yes option to skip prompt to lvconvert thin pool chunksize.
- Support lvremove -ff to remove thin volumes from broken thin pools.
- Require --yes to skip raid repair prompt.
- Change makefile %.d generation to handle filename changes without make clean.
- Fix use of buildir in make pofile.
- Enhance private volumes UUIDs with suffixed for easier detection.
- Do not use reserved _[tc]meta volumes for temporary LVs.
- Leave backup pool metadata with _meta%d suffix instead of reserved _tmeta%d.
- Allow RAID repair to reuse PVs from same image that suffered a failure.
- New RAID images now avoid allocation on any PVs in the same parent RAID LV.
- Always reevaluate filters just before creating PV.
- Fix dm_report_field_string_list to handle delimiter with multiple chars.
- Add dm_report_field_reserved_value for per-field reserved value definition.
* Fri Jul 18 2014 Tom Callaway <spot@fedoraproject.org> - 2.02.107-2 * Fri Jul 18 2014 Tom Callaway <spot@fedoraproject.org> - 2.02.107-2
- fix license handling - fix license handling

View File

@ -1 +1 @@
efa5b0ff0245cbccf53aec1f3d8840ba LVM2.2.02.107.tgz 6834647fcf9b950a92f3acd12b4f427e LVM2.2.02.108.tgz

View File

@ -1 +1 @@
LVM2.2.02.107.tgz LVM2.2.02.108.tgz