From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10595 invoked by alias); 26 Jan 2009 22:40:32 -0000 Received: (qmail 10575 invoked by alias); 26 Jan 2009 22:40:31 -0000 X-SWARE-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Status: No, hits=-1.3 required=5.0 tests=AWL,BAYES_00,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: STABLE3 - Merge branch 'STABLE3' of ssh://lon@git.fedorahosted.org/git/cluster into stable3 To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 758ca5bad1e4828b7026274fd155414f571c3d5b 390b97907834c86edaafa457e2e95c260903584f X-Git-Newrev: 3246fc44b461bb98c2807f3a51c400e5ae6b425a From: Lon Hohberger Message-Id: <20090126224009.E5E8B12055C@lists.fedorahosted.org> Date: Mon, 26 Jan 2009 22:40: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/msg00281.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3246fc44b461bb98c2807f3a51c400e5ae6b425a Commit: 3246fc44b461bb98c2807f3a51c400e5ae6b425a Parent: 758ca5bad1e4828b7026274fd155414f571c3d5b 390b97907834c86edaafa457e2e95c260903584f Author: Lon Hohberger AuthorDate: Mon Jan 26 17:34:00 2009 -0500 Committer: Lon Hohberger CommitterDate: Mon Jan 26 17:34:00 2009 -0500 Merge branch 'STABLE3' of ssh://lon@git.fedorahosted.org/git/cluster into stable3 fence/agents/lpar/fence_lpar.py | 2 +- gfs2/fsck/fs_bits.h | 5 - gfs2/libgfs2/buf.c | 17 -- gfs2/libgfs2/device_geometry.c | 6 +- gfs2/libgfs2/fs_bits.c | 114 +---------- gfs2/libgfs2/fs_geometry.c | 9 +- gfs2/libgfs2/fs_ops.c | 82 ++++---- gfs2/libgfs2/gfs2_log.c | 8 +- gfs2/libgfs2/libgfs2.h | 355 ++++++++++++++++---------------- gfs2/libgfs2/locking.c | 3 +- gfs2/libgfs2/size.c | 6 +- gfs2/libgfs2/structures.c | 131 ++----------- gfs2/tool/df.c | 74 ++++++- gfs2/tool/gfs2_tool.h | 6 +- gfs2/tool/main.c | 12 +- make/release.mk | 28 +++- rgmanager/src/resources/mysql.metadata | 10 + rgmanager/src/resources/mysql.sh | 8 +- 18 files changed, 365 insertions(+), 511 deletions(-)