From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24020 invoked by alias); 24 Mar 2009 21:00:06 -0000 Received: (qmail 24014 invoked by alias); 24 Mar 2009 21:00:06 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion.fedora.phx.redhat.com Subject: gfs2-utils: master - Merge branch 'master' of git://git.fedorahosted.org/gfs2-utils To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: gfs2-utils.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: cfae578070d8219cd3f3eb7c2f3bd8ab007c19e4 37231b6f2f25658ab64a131896a3c5e559c30e0c X-Git-Newrev: c960ea154ba1c94022dc0184801ef8a17710e403 From: Steven Whitehouse Message-Id: <20090324205936.D2E011201A2@lists.fedorahosted.org> Date: Tue, 24 Mar 2009 21:00:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00897.txt.bz2 Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=c960ea154ba1c94022dc0184801ef8a17710e403 Commit: c960ea154ba1c94022dc0184801ef8a17710e403 Parent: cfae578070d8219cd3f3eb7c2f3bd8ab007c19e4 37231b6f2f25658ab64a131896a3c5e559c30e0c Author: Steven Whitehouse AuthorDate: Tue Mar 24 20:53:57 2009 +0000 Committer: Steven Whitehouse CommitterDate: Tue Mar 24 20:53:57 2009 +0000 Merge branch 'master' of git://git.fedorahosted.org/gfs2-utils Makefile | 8 + gfs2/convert/gfs2_convert.c | 498 +++++++++++++++++++++---------------------- gfs2/libgfs2/fs_ops.c | 10 +- gfs2/libgfs2/libgfs2.h | 4 + 4 files changed, 262 insertions(+), 258 deletions(-)