From 45f813cfbbb715e1634312e571ad69d86770d0e9 Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@fedoraproject.org>
Date: Thu, 11 Jan 2007 23:11:33 +0000
Subject: [PATCH] Upstream update. N.B. Note dumpconfig syntax change.

---
 .cvsignore |  2 +-
 lvm2.spec  | 17 +++++++++++++++--
 sources    |  2 +-
 upstream   |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a19c07c..b8e8628 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-LVM2.2.02.17.tgz
+LVM2.2.02.18.tgz
diff --git a/lvm2.spec b/lvm2.spec
index a7c6c72..689c969 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -1,8 +1,8 @@
-%define device_mapper_version 1.02.13
+%define device_mapper_version 1.02.14
 
 Summary: Userland logical volume management tools 
 Name: lvm2
-Version: 2.02.17
+Version: 2.02.18
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
@@ -113,6 +113,19 @@ fi
 
 
 %changelog
+* Thu Jan 11 2006 Alasdair Kergon <agk@redhat.com> - 2.02.18-1
+- Use CFLAGS when linking so mixed sparc builds can supply -m64.
+- Prevent permission changes on active mirrors.
+- Print warning instead of error message if lvconvert cannot zero volume.
+- Add snapshot options to lvconvert man page.
+- dumpconfig accepts a list of configuration variables to display.
+- Change dumpconfig to use --file to redirect output to a file.
+- Avoid vgreduce error when mirror code removes the log LV.
+- Fix ambiguous vgsplit error message for split LV.
+- Fix lvextend man page typo.
+- Use no flush suspending for mirrors.
+- Fix create mirror with name longer than 22 chars.
+
 * Thu Dec 14 2006 Alasdair Kergon <agk@redhat.com> - 2.02.17-1
 - Add missing pvremove error message when device doesn't exist.
 - When lvconvert allocates a mirror log, respect parallel area constraints.
diff --git a/sources b/sources
index cd2f5d7..816cff1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1bebdabb0dace2b9dd98579625ce53c  LVM2.2.02.17.tgz
+d7b5c5aa415afd4244d03f3c62dabb32  LVM2.2.02.18.tgz
diff --git a/upstream b/upstream
index a19c07c..b8e8628 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-LVM2.2.02.17.tgz
+LVM2.2.02.18.tgz