cluster: STABLE3 - Merge branch 'STABLE3' of git://git.fedorahosted.org/git/cluster into STABLE3

[Christine Caulfield]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=1d788f94123ca4efcb8fb55262f29e003b5c9c63
Commit:        1d788f94123ca4efcb8fb55262f29e003b5c9c63
Parent:        06a60497fc1072bf6480a2b0e757554f6d54aab7 86608891ba8dfed86b92f9b5bfb259461a8a45ba
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Tue Jan 27 10:11:45 2009 +0000
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Tue Jan 27 10:11:45 2009 +0000

Merge branch 'STABLE3' of git://git.fedorahosted.org/git/cluster into STABLE3


 common/liblogthread/liblogthread.c               |   14 +-
 configure                                        |   39 +-
 fence/agents/Makefile                            |    2 +
 fence/agents/lib/fencing.py.py                   |    2 +-
 fence/agents/lpar/fence_lpar.py                  |    2 +-
 gfs-kernel/src/gfs/acl.c                         |    3 +-
 gfs-kernel/src/gfs/inode.c                       |   12 +-
 gfs-kernel/src/gfs/ioctl.c                       |    5 +-
 gfs-kernel/src/gfs/log.c                         |   20 -
 gfs-kernel/src/gfs/ops_address.c                 |  119 ++--
 gfs-kernel/src/gfs/ops_export.c                  |   20 +-
 gfs-kernel/src/gfs/ops_inode.c                   |    9 +-
 gfs-kernel/src/gfs/quota.c                       |    3 +-
 gfs/gfs_fsck/Makefile                            |    9 +-
 gfs/gfs_mkfs/Makefile                            |    9 +-
 gfs/man/Makefile                                 |    6 +-
 gfs/man/fsck.gfs.8                               |   59 ++
 gfs/man/gfs.8                                    |    6 +-
 gfs/man/gfs_fsck.8                               |   59 --
 gfs/man/gfs_grow.8                               |    2 +-
 gfs/man/gfs_jadd.8                               |    2 +-
 gfs/man/gfs_mkfs.8                               |   82 ---
 gfs/man/gfs_mount.8                              |  193 -----
 gfs/man/gfs_tool.8                               |    2 +-
 gfs/man/mkfs.gfs.8                               |   82 +++
 gfs/man/mount.gfs.8                              |  193 +++++
 gfs2/convert/gfs2_convert.c                      |    9 +-
 gfs2/fsck/TODO                                   |   49 --
 gfs2/fsck/fs_bits.h                              |    6 -
 gfs2/include/global.h                            |   42 --
 gfs2/include/osi_user.h                          |  421 -----------
 gfs2/libgfs2/bitmap.c                            |    4 -
 gfs2/libgfs2/block_list.c                        |    2 +-
 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                           |  364 +++++-----
 gfs2/libgfs2/locking.c                           |    3 +-
 gfs2/libgfs2/misc.c                              |  251 +------
 gfs2/libgfs2/size.c                              |   19 +-
 gfs2/libgfs2/structures.c                        |  131 +---
 gfs2/man/Makefile                                |    4 +-
 gfs2/man/fsck.gfs2.8                             |   59 ++
 gfs2/man/gfs2.8                                  |    4 +-
 gfs2/man/gfs2_fsck.8                             |   59 --
 gfs2/man/gfs2_grow.8                             |    2 +-
 gfs2/man/gfs2_jadd.8                             |    2 +-
 gfs2/man/gfs2_mount.8                            |  202 -----
 gfs2/man/mount.gfs2.8                            |  202 +++++
 gfs2/mkfs/main_grow.c                            |    2 +-
 gfs2/mkfs/main_jadd.c                            |   33 -
 gfs2/tool/Makefile                               |    1 -
 gfs2/tool/decipher_lockstate_dump                |  175 -----
 gfs2/tool/df.c                                   |   74 ++-
 gfs2/tool/gfs2_tool.h                            |    6 +-
 gfs2/tool/layout.c                               |  848 ----------------------
 gfs2/tool/main.c                                 |   52 +-
 gfs2/tool/misc.c                                 |  329 ---------
 gfs2/tool/parse_lockdump                         |  158 ----
 make/defines.mk.input                            |    1 +
 make/release.mk                                  |  118 +++
 rgmanager/src/Makefile                           |    6 +-
 rgmanager/src/resources/Makefile                 |    4 +-
 rgmanager/src/resources/mysql.metadata           |   10 +
 rgmanager/src/resources/mysql.sh                 |    8 +-
 rgmanager/src/resources/ra-api-1-modified.dtd    |    2 +-
 rgmanager/src/resources/ra2csv.xsl               |   19 +
 rgmanager/src/resources/ra2man.xsl               |  158 ++++
 rgmanager/src/resources/ra2oid.xsl               |   68 ++
 rgmanager/src/resources/utils/config-utils.sh.in |    8 +
 rgmanager/src/resources/utils/ra-skelet.sh       |    5 +-
 74 files changed, 1494 insertions(+), 3616 deletions(-)