From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5404-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 7849 invoked by alias); 19 Apr 2012 21:50:39 -0000
Received: (qmail 7832 invoked by uid 9478); 19 Apr 2012 21:50:38 -0000
Date: Thu, 19 Apr 2012 21:50:00 -0000
Message-ID: <20120419215038.7830.qmail@sourceware.org>
From: jbrassow@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/tools lvconvert.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2012-04/txt/msg00020.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	jbrassow@sourceware.org	2012-04-19 21:50:37

Modified files:
	tools          : lvconvert.c 

Log message:
	Fix for bug 807776: invalid lvconvert --merge output should mention raid1 now
	
	s/snapshot/mergeable volume/

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvconvert.c.diff?cvsroot=lvm2&r1=1.189&r2=1.190

--- LVM2/tools/lvconvert.c	2012/03/30 08:58:02	1.189
+++ LVM2/tools/lvconvert.c	2012/04/19 21:50:37	1.190
@@ -1760,7 +1760,7 @@
 
 	if (lp->merge) {
 		if (!lv_is_cow(lv)) {
-			log_error("Logical volume \"%s\" is not a snapshot",
+			log_error("\"%s\" is not a mergeable logical volume",
 				  lv->name);
 			return ECMD_FAILED;
 		}