Abhijith Das (5):
      gfs2 manual pages: gfs2_convert manpage and documentation updates
      gfs2_convert: gfs2_convert doesn't resume after interrupted conversion
      gfs2_convert: corrupts file system when directory has di_height 3
      gfs2_convert: exits with success without doing anything
      gfs2_convert exits with success without doing anything

Benjamin Marzinski (1):
      gfs2-utils: enable gfs2_grow on completely full filesystems

Bob Peterson (36):
      Fix device name and mount point in utils
      gfs2_edit restoremeta should not return 0 on failure
      fsck.gfs2: unaligned access on ia64
      GFS2: libgfs2 bitfit algorithm using wrong shift point
      gfs2-utils: mkfs can't fsync device with 32MB RGs
      fsck.gfs2 deletes directories if they get too big
      fsck.gfs2 segfaults if journals are missing
      Updating /proc/mounts and /etc/mtab with mount args for GFS2 fs
      fsck.gfs2 truncates directories with more than 100,000 entries
      GFS2: fsck.gfs2 seems to process large files twice
      gfs2_edit: better printing of directory leaf information
      gfs2_edit: print hex numbers in lower-case
      gfs2_edit: negative block numbers don't jump a negative amount
      gfs2_edit: tiny (stuffed) files had user data saved with savemeta
      gfs2_edit: give meaningful feedback for savemeta and restoremeta
      gfs2_edit: Fix memory leak in savemeta option
      gfs2_edit: Split extended display functions into extended.c
      gfs2_edit: Move more functions to extended.c
      gfs2_edit: Extend individual field printing/editing
      gfs2_edit: fix page down on rindex
      gfs2_edit: print field names in right column
      gfs2_edit: display block allocation on rgrps and bitmaps
      gfs2_edit: fix extended.h to not double-include
      mkfs.gfs2 should support discard request generation
      GFS2: mkfs.gfs2 segfaults with 18.55TB and -b512
      fsck.gfs2: reports master/root dinodes as unused and fixes the bitmap
      fsck.gfs2: can't repair rgrps resulting from gfs_grow->gfs2_convert
      gfs2_edit: handle corrupt file systems better
      gfs2_edit: print large block numbers better
      gfs2_edit: has problems printing gfs1 journals
      gfs2_edit: add -d option for printing journal details
      gfs2_edit: Fix error message on blockalloc when outside bitmap
      gfs2_edit: fix careless compiler warning
      gfs2_edit: fix segfault in set_bitmap when block is in rgrp
      Reported UUID from 'gfs2_edit -p sb' should be lower-case
      gfs2_edit savemeta doesn't save all leaf blocks for large dirs

Brandon Perkins (1):
      fence-agents: Fence_rhevm needs to change "RUNNING" status to "UP" status as the REST-API has changed.

Chris Feist (2):
      cman: Added checkquorum script for self fencing
      cman: Minor fixes for checkquorum script

Christine Caulfield (6):
      cman: only load ckpt service by default
      config: Fix ccs_tool create -n
      cman: fix quorum recalculation when a node is externally killed
      cman: Recalculate expected_votes on a config reload.
      cman: Mention cman_tool version -S in man page
      cman: Calculate expected_votes correctly after leave remove

David Teigland (16):
      fenced: use cpg ringid
      dlm_controld: wrong fencing time comparison
      dlm_controld: wrong fencing time comparison (2)
      dlm_controld/gfs_controld: make default plock_ownership 0
      dlm_controld: fix plock checkpoint signatures
      dlm_controld: fix plock owner in checkpoints
      dlm_controld: fix save_plocks initialization
      dlm_controld: fix plock owner syncing
      dlm_controld: fix plock signature in stored message
      Revert "dlm_controld: fix save_plocks initialization"
      dlm_controld: ignore plocks until checkpoint time
      gfs_controld: fix plock owner syncing
      fenced: use post_join_delay after cluster join
      gfs_controld: fix plock owner in unmount
      fenced: don't ignore victim_done messages for reduced victims
      dlm_controld: always return error if the daemon is not ready to operate

Fabio M. Di Nitto (47):
      cluster: disable ldap loader support
      cluster: support only xmlconfig loader
      resource-agents: drop support for drbd and smb resource agents
      cluster: remove fence_xvmd support
      cman: use hash_cluster_id by default
      Revert "halvm: Fix bug 506587: lvm agent incorrectly reports vg is in volume_list"
      cman init: wait for corosync daemon to exit on stop
      add missing man pages
      cman init: more LSB compliance
      rgmanger init: more LSB complaint bits
      cman: add default config snippet for cman init script
      cman init defaults: support only xmlconfig loader
      gfs2 init: make the init script LSB compliant
      Merge branch 'RHEL6' of ssh://git.fedorahosted.org/git/cluster into rhel6
      cman config: copy all logging objects to the top level tree
      fence: rename ibmblade to bladecenter_snmp
      fence agents: add compatibility symlink for ibmblade / bladecenter_snmp
      cman: allow init script to pass options to fenced
      config: fix several issues with reload operation
      config: free new config if we cannot find the config_version
      config: more cman_tool config reload cleanup
      cman: simply message broadcasting handling
      config: better error report when autodetecting config version errors
      cman-preconfig: better handle of logging reload operation
      cman-preconfig: better handle of logging reload operation (part 2)
      cman: fix consensus calculation
      cman: do not propagate old configurations around
      cman init: fix "stop remove" operation
      cman: fix startup race condition when configs are different across nodes
      ccs_tool: completely remove references to update/upgrades
      cman init: add support for "nocluster" kernel cmdline to not start cman at boot
      cman init: do not include wrong default file
      ccs_tool: deprecate editing capabilities
      build: allow dbus notification code to be disabled
      config: stop leaking memory on config reload
      cman-preconfig: allow cman to configure corosync multicast ttl
      fs-lib: fix do_monitor device mapping
      cman init: increse the default timeout waiting for quorum
      cman init: wait for dlm_controld to be fully operational before proceeding
      Revert "fence_scsi_check: watchdog script for fence_scsi"
      Revert "fence_scsi: create /var/run/cluster if necessary"
      Revert "fence_scsi: write devices to tmp file on unfence"
      Revert "fence_scsi: move key file to /var/run/cluster"
      Revert "gfs2-utils: enable gfs2_grow on completely full filesystems"
      Revert "gfs2_edit savemeta doesn't save all leaf blocks for large dirs"
      Revert "Reported UUID from 'gfs2_edit -p sb' should be lower-case"
      Major tree cleanup

Federico Simoncelli (1):
      config: Add missing cman_label

Guido G√ľnther (1):
      fence_rsb: Raise exceptions not strings

Jan Friesse (6):
      cman: check for new config only once per second
      Cman: Add support for udpu and rdma transport
      Cman: Handle corosync exit codes
      Cman: Handle "another instance running" error code
      Cman: test that corosync is not already running
      Cman: Handle INT and TERM signals correctly

Jeremy Miller (1):
      qdisk: Informational syslog message indicating label overrides device

Jim Ramsay (1):
      Allow fence_scsi to use any valid hexadecimal key

Jonathan Brassow (3):
      halvm: Fix bug 506587: lvm agent incorrectly reports vg is in volume_list
      halvm: Fix bug 593108: lvm agent incorrectly reports vg is in volume_list
      Fix bug 683213 - mirror dev failure in HA LVM can cause service failure

Lon Hohberger (86):
      resource-agents: Resolve incorrect default
      config: Add missing resource docs to cluster.rng
      config: Clean up recursion and documentation
      config: Add documentation for interface tag
      Revert "config: Clean up recursion and documentation"
      Revert "config: Add missing resource docs to cluster.rng"
      resource-agents: Add missing resource docs
      config: Add missing resource docs to cluster.rng
      config: Clean up recursion and documentation
      resource-agents: Clean up recursion and documentation
      rgmanager: Pass timeouts to resource agents
      rgmanager: Use sysrq-b to reboot
      resource-agents: Make vm.sh use stop/start timeouts
      rgmanager: fix staged upgrade compatibility
      resource-agents: fix incorrect link resolution in fs-lib
      resource-agents: Add NFSv4 support
      resource-agents: Add NFSv4 agent to installation
      config: Update cluster schema
      doc: Add auto-generated cluster.conf reference
      doc: Install cluster.conf reference
      resource-agents: Add RHEVM status program
      rgmanager: Make clulog filter correctly
      rgmanager: Man page improvements
      resource-agents: Allow other values for "yes"
      config: Add doc for cman_label attribute
      cman: Recalculate quorum on config change
      config: Add tomcat-6 resource agent to schema
      doc: Add tomcat-6 to cluster_conf.html
      config: Allow multiple logging_daemon tags
      resource-agents: Drop tomcat-5 from build
      cman: Recalculate quorum on quorum device vote changes
      cman: Deprecate specifying config version to cman_tool
      cman: Clarify man page on config distribution
      config: Fix broken fence_egenera options
      resource-agents: Stop using '-' as 1st char of log messages
      cman: Make qdiskd exit if removed from configuration
      cman: Update cman_tool version section in man page
      config: Add missing qdiskd options
      qdisk: Assume 1 vote if not specified in cluster.conf
      Revert "Revert "config: Fix broken fence_egenera options""
      cman: Make qdiskd heuristics time out
      rgmanager: Fix clustat return code
      rgmanager: Honor restricted FDs during migrations
      resource-agents: Add multi-instance Oracle database agents
      rgmanager: Present flags in clustat output
      rgmanager: Make clufindhostname -i predictable
      resource-agents: Fix migrateuriopt setting
      resource-agents: Use literal quotes for tr calls
      rgmanager: Add non-critical flag to resources
      rgmanager: Add non-critical base behavior
      rgmanager: Header cleanup
      rgmanager: Use rg_strings.c for flags
      rgmanager: Present all flags in clustat output
      rgmanager: Mark non-critical resources disabled
      rgmanager: Add convalesce operation
      rgmanager: Allow restart,disable recovery policy
      rgmanager: Ensure state is preserved across config changes
      rgmanager: Fix handling of independent subtrees
      rgmanager: Do not fail service if non-critical resources fail to stop
      rgmanager: Support convalesce w/ central_processing
      rgmanager: Add -c option to man page & clusvcadm -h
      rgmanager: Add independent subtree restart thresholds
      rgmanager: Add failure tolerances to resources.rng
      rgmanager: clean up independent subtree restart handling
      rgmanager: Fix corner case in critical/non-critical handling
      Revert "rgmanager: Support convalesce w/ central_processing"
      resource-agents: Support convalesce w/ central_processing
      rgmanager: Support convalesce w/ central_processing
      rgmanager: DBus notifications for service state changes
      rgmanager: Clean up dbus notifications
      rgmanager: Retry dbus if we get disconnected
      rgmanager: minor dbus cleanups
      rgmanager: Match fenced's option to disable DBus
      config: Update schema
      doc: Update cluster_conf.html to match schema
      qdiskd: Fix auto-vote calculation loop
      qdiskd: Fix bad timer check
      fence-agents: Accept other values for "true"
      config: Add DRBD 0.8.3 metadata back to schema
      resource-agents: Fix nfs mount contexts
      rgmanager: Make clustat -f not query CCS/objdb
      rgmanager: Fix clustat help & version operations
      rgmanager: Fix reference count handling
      rgmanager: Add resource-defaults section
      rgmanager: Pause during exit if we stopped services
      rgmanager: fix compiler warning in clulog.c

Marek 'marx' Grac (32):
      fence_wti: Add direct support for WTI VMR
      fence_wti: support non-default TCP ports
      fence_apc: fence_apc fails for some port numbers
      resource-agents: Use SIGQUIT if SIGTERM was not fast enough
      resource-agents: new agent for tomcat 6
      resource-agents: change build system to include tomcat6 RA
      fence_ilo: will throw exception if user does not have power priviledges
      resource-agents: RA for psql does not work correctly with netmask
      resource-agents: fix utility to obtain data from ccs_tool
      fence_rhevm: New fence agent for RHEV-M REST API
      fence-agents: Add power_wait to fence_ipmilan
      fence_drac5: make "port" a synonym of "module_name" for drac5
      fencing: Not all parameters appear in metadata (1/2)
      fencing: Not all parameters appear in metadata (2/2)
      fence_egenera: Missing -u / user in manual page
      fence_cisco_ucs: New fence agent for Cisco UCS
      fencing: Method to cause one node to delay fencing
      fencing: Method to cause one node to delay fencing [2]
      fencing: Method to cause one node to delay fencing - drac, egenera
      fencing: Method to cause one node to delay fencing - ipmilan
      Revert "config: Fix broken fence_egenera options"
      resource-agents: fix resource agent for named
      fence_ipmilan: Add "diag" option to support "ipmitool chassis power diag"
      fence_ipmilan: Fix manual page to describe usage with HP iLO 3
      library: Metadata are not correct if agent does not support on/off
      resource-agents: Add option disable_rdisc to ip.sh
      fence_wti: Unable to parse output when splitted into several screens
      fence_wti: Unable to parse output when splitted into several screens (2/2)
      fence_rhevm: Update URL to RHEV-M REST API
      fence_cisco_ucs: Support for sub-organization
      fence_cisco_ucs: Fix for support for sub-organization
      fence_ipmilan: Correct return code for diag operation

Masahiro Matsuya (1):
      resource-agents: Fix migration mapping behavior w/ virsh

Ryan O'Hara (19):
      Fix open flags so that logfile won't be truncated each time we open it.
      Fix syntax error in code that opens logfile.
      fence_scsi: identify dm-multipath devices correctly
      fence_scsi: fix regular expression for grep
      fence_scsi: always do sg_turs before registration
      fence_scsi: always do sg_turs for dm-mp devices
      fence_scsi: verify that on/off actions succeed
      fence_scsi: properly log errors for all commands
      fenced: send dbus signal when node is fenced
      fenced: update fenced man page with -q option
      fence_scsi: move key file to /var/run/cluster
      fence_scsi: write devices to tmp file on unfence
      fence_scsi: create /var/run/cluster if necessary
      fence_scsi_check: watchdog script for fence_scsi
      fence_scsi: grep for keys should be case insensitive
      fence_scsi: move key file to /var/run/cluster
      fence_scsi: write devices to tmp file on unfence
      fence_scsi: create /var/run/cluster if necessary
      fence_scsi_check: watchdog script for fence_scsi

Shane Bradley (1):
      rgmanager: Fix nofailback when service is in 'starting' state

Steven Whitehouse (1):
      gfs2_edit: Fix bitmap editing function

igor (1):
      rgmanager: Update last_owner on failover

 Makefile                                           |   12 +-
 cman/Makefile                                      |    2 +-
 cman/cman_tool/join.c                              |   50 +-
 cman/cman_tool/main.c                              |   77 +-
 cman/daemon/cman-preconfig.c                       |  441 +-
 cman/daemon/cman.h                                 |    2 +-
 cman/daemon/cmanconfig.c                           |    8 +-
 cman/daemon/commands.c                             |  198 +-
 cman/daemon/daemon.c                               |   11 +-
 cman/init.d/Makefile                               |   10 +-
 cman/init.d/cman.in                                |  192 +-
 cman/init.d/cman.init.defaults.in                  |   90 +
 cman/man/Makefile                                  |    4 +-
 cman/man/checkquorum.8                             |   29 +
 cman/man/cman_notify.8                             |   17 +
 cman/man/cman_tool.8                               |   38 +-
 cman/man/qdisk.5                                   |    8 +-
 cman/qdisk/disk.c                                  |    1 +
 cman/qdisk/main.c                                  |   76 +-
 cman/qdisk/score.c                                 |   93 +-
 cman/qdisk/score.h                                 |    7 +-
 cman/scripts/Makefile                              |   10 +
 cman/scripts/checkquorum                           |   97 +
 config/plugins/Makefile                            |    2 +-
 config/plugins/xml/config.c                        |    2 -
 config/tools/Makefile                              |    2 +-
 config/tools/ccs_tool/editconf.c                   |   10 +-
 config/tools/man/Makefile                          |    3 +-
 config/tools/man/ccs_config_dump.8                 |    2 +-
 config/tools/man/ccs_tool.8                        |  163 +-
 config/tools/xml/ccs_config_validate.in            |   34 +-
 config/tools/xml/cluster.rng.in                    | 1735 +-
 configure                                          |  179 +-
 doc/Makefile                                       |    3 +-
 doc/cluster_conf.html                              | 1240 +
 fence/Makefile                                     |    2 +-
 fence/agents/Makefile                              |    6 -
 fence/agents/alom/Makefile                         |    7 -
 fence/agents/alom/fence_alom.py                    |   86 -
 fence/agents/apc/Makefile                          |    7 -
 fence/agents/apc/fence_apc.py                      |  243 -
 fence/agents/apc_snmp/Makefile                     |    7 -
 fence/agents/apc_snmp/README                       |   45 -
 fence/agents/apc_snmp/fence_apc_snmp.py            |  206 -
 fence/agents/apc_snmp/powernet369.mib              |31109 --------------------
 fence/agents/baytech/Makefile                      |    5 -
 fence/agents/baytech/fence_baytech.8               |   84 -
 fence/agents/baytech/fence_baytech.pl              |  683 -
 fence/agents/bladecenter/Makefile                  |    7 -
 fence/agents/bladecenter/fence_bladecenter.py      |  136 -
 fence/agents/brocade/Makefile                      |    5 -
 fence/agents/brocade/fence_brocade.8               |   84 -
 fence/agents/brocade/fence_brocade.pl              |  255 -
 fence/agents/bullpap/Makefile                      |    5 -
 fence/agents/bullpap/fence_bullpap.8               |   73 -
 fence/agents/bullpap/fence_bullpap.pl              |  366 -
 fence/agents/cisco_mds/Makefile                    |    7 -
 fence/agents/cisco_mds/fence_cisco_mds.py          |  126 -
 fence/agents/cpint/Makefile                        |    5 -
 fence/agents/cpint/fence_cpint.8                   |   54 -
 fence/agents/cpint/fence_cpint.pl                  |  143 -
 fence/agents/drac/Makefile                         |    5 -
 fence/agents/drac/fence_drac.8                     |   99 -
 fence/agents/drac/fence_drac.pl                    |  667 -
 fence/agents/drac/test_drac.sh                     |   83 -
 fence/agents/drac5/Makefile                        |    7 -
 fence/agents/drac5/fence_drac5.py                  |  142 -
 fence/agents/egenera/Makefile                      |    5 -
 fence/agents/egenera/fence_egenera.8               |   72 -
 fence/agents/egenera/fence_egenera.pl              |  431 -
 fence/agents/eps/Makefile                          |    7 -
 fence/agents/eps/fence_eps.py                      |  129 -
 fence/agents/ibmblade/Makefile                     |    7 -
 fence/agents/ibmblade/fence_ibmblade.py            |   88 -
 fence/agents/ifmib/Makefile                        |    7 -
 fence/agents/ifmib/README                          |   45 -
 fence/agents/ifmib/fence_ifmib.py                  |  149 -
 fence/agents/ilo/Makefile                          |    7 -
 fence/agents/ilo/fence_ilo.py                      |  121 -
 fence/agents/ilo_mp/Makefile                       |    7 -
 fence/agents/ilo_mp/fence_ilo_mp.py                |   84 -
 fence/agents/intelmodular/Makefile                 |    7 -
 fence/agents/intelmodular/fence_intelmodular.py    |   99 -
 fence/agents/ipmilan/Makefile                      |   33 -
 fence/agents/ipmilan/expect.c                      |  342 -
 fence/agents/ipmilan/expect.h                      |   52 -
 fence/agents/ipmilan/ipmilan.c                     | 1124 -
 fence/agents/ldom/Makefile                         |    7 -
 fence/agents/ldom/fence_ldom.py                    |  139 -
 fence/agents/lib/Makefile                          |    7 -
 fence/agents/lib/fence2man.xsl                     |   53 -
 fence/agents/lib/fence2rng.xsl                     |   20 -
 fence/agents/lib/fencing.py.py                     |  891 -
 fence/agents/lib/fencing_snmp.py.py                |  131 -
 fence/agents/lpar/Makefile                         |    7 -
 fence/agents/lpar/fence_lpar.py                    |  185 -
 fence/agents/manual/Makefile                       |   21 -
 fence/agents/manual/fence_ack_manual.8             |   39 -
 fence/agents/manual/fence_ack_manual.sh            |   37 -
 fence/agents/mcdata/Makefile                       |    5 -
 fence/agents/mcdata/fence_mcdata.8                 |   84 -
 fence/agents/mcdata/fence_mcdata.pl                |  293 -
 fence/agents/nss_wrapper/Makefile                  |   26 -
 fence/agents/nss_wrapper/fence_nss_wrapper.c       |  482 -
 fence/agents/rackswitch/Makefile                   |   26 -
 fence/agents/rackswitch/do_rack.c                  |  752 -
 fence/agents/rackswitch/do_rack.h                  |   27 -
 fence/agents/rackswitch/fence_rackswitch.8         |   70 -
 fence/agents/rsa/Makefile                          |    7 -
 fence/agents/rsa/fence_rsa.py                      |   92 -
 fence/agents/rsb/Makefile                          |    5 -
 fence/agents/rsb/fence_rsb.8                       |   76 -
 fence/agents/rsb/fence_rsb.py                      |  408 -
 fence/agents/sanbox2/Makefile                      |    7 -
 fence/agents/sanbox2/fence_sanbox2.py              |  167 -
 fence/agents/scsi/Makefile                         |    7 -
 fence/agents/scsi/fence_scsi.8                     |  109 -
 fence/agents/scsi/fence_scsi.pl                    |  659 -
 fence/agents/virsh/Makefile                        |    7 -
 fence/agents/virsh/fence_virsh.py                  |  107 -
 fence/agents/vixel/Makefile                        |    5 -
 fence/agents/vixel/fence_vixel.8                   |   72 -
 fence/agents/vixel/fence_vixel.pl                  |  212 -
 fence/agents/vmware/Makefile                       |    8 -
 fence/agents/vmware/fence_vmware.py                |  342 -
 fence/agents/vmware/fence_vmware_helper.pl         |  276 -
 fence/agents/wti/Makefile                          |    7 -
 fence/agents/wti/fence_wti.py                      |  157 -
 fence/agents/xcat/Makefile                         |    5 -
 fence/agents/xcat/fence_xcat.8                     |   63 -
 fence/agents/xcat/fence_xcat.pl                    |  197 -
 fence/agents/xvm/Makefile                          |   58 -
 fence/agents/xvm/README                            |  182 -
 fence/agents/xvm/TODO                              |   33 -
 fence/agents/xvm/debug.c                           |   18 -
 fence/agents/xvm/debug.h                           |   15 -
 fence/agents/xvm/fence_xvmd.8                      |  124 -
 fence/agents/xvm/fence_xvmd.c                      |  994 -
 fence/agents/xvm/mcast.c                           |  366 -
 fence/agents/xvm/mcast.h                           |   16 -
 fence/agents/xvm/options-ccs.c                     |   97 -
 fence/agents/xvm/options.c                         |  774 -
 fence/agents/xvm/options.h                         |   65 -
 fence/agents/xvm/simple_auth.c                     |  395 -
 fence/agents/xvm/simple_auth.h                     |   17 -
 fence/agents/xvm/tcp.c                             |  282 -
 fence/agents/xvm/tcp.h                             |    9 -
 fence/agents/xvm/tests/hvm.xml                     |   32 -
 fence/agents/xvm/tests/linux.xml                   |   31 -
 fence/agents/xvm/virt.c                            |  202 -
 fence/agents/xvm/virt.h                            |   60 -
 fence/agents/xvm/vm_states.c                       |  414 -
 fence/agents/xvm/xml.c                             |  316 -
 fence/agents/xvm/xvm.h                             |   65 -
 fence/agents/zvm/Makefile                          |    5 -
 fence/agents/zvm/fence_zvm.8                       |   64 -
 fence/agents/zvm/fence_zvm.pl                      |  353 -
 fence/fenced/Makefile                              |    8 +-
 fence/fenced/config.c                              |    2 +
 fence/fenced/config.h                              |    3 +
 fence/fenced/cpg.c                                 |  303 +-
 fence/fenced/dbus.c                                |   87 +
 fence/fenced/fd.h                                  |   14 +
 fence/fenced/main.c                                |   16 +-
 fence/fenced/member_cman.c                         |   28 +-
 fence/fenced/recover.c                             |    9 +-
 fence/man/fenced.8                                 |    3 +
 gfs-kernel/src/gfs/Makefile                        |   72 -
 gfs-kernel/src/gfs/acl.c                           |  398 -
 gfs-kernel/src/gfs/acl.h                           |   34 -
 gfs-kernel/src/gfs/bits.c                          |  211 -
 gfs-kernel/src/gfs/bits.h                          |   18 -
 gfs-kernel/src/gfs/bmap.c                          | 1393 -
 gfs-kernel/src/gfs/bmap.h                          |   35 -
 gfs-kernel/src/gfs/daemon.c                        |  181 -
 gfs-kernel/src/gfs/daemon.h                        |   11 -
 gfs-kernel/src/gfs/dio.c                           | 1342 -
 gfs-kernel/src/gfs/dio.h                           |  157 -
 gfs-kernel/src/gfs/dir.c                           | 2394 --
 gfs-kernel/src/gfs/dir.h                           |   42 -
 gfs-kernel/src/gfs/eaops.c                         |  173 -
 gfs-kernel/src/gfs/eaops.h                         |   21 -
 gfs-kernel/src/gfs/eattr.c                         | 2007 --
 gfs-kernel/src/gfs/eattr.h                         |   97 -
 gfs-kernel/src/gfs/file.c                          |  437 -
 gfs-kernel/src/gfs/file.h                          |   42 -
 gfs-kernel/src/gfs/fixed_div64.h                   |  107 -
 gfs-kernel/src/gfs/format.h                        |   17 -
 gfs-kernel/src/gfs/gfs.h                           |   65 -
 gfs-kernel/src/gfs/gfs_ioctl.h                     |   31 -
 gfs-kernel/src/gfs/gfs_ondisk.h                    | 1904 --
 gfs-kernel/src/gfs/glock.c                         | 3035 --
 gfs-kernel/src/gfs/glock.h                         |  140 -
 gfs-kernel/src/gfs/glops.c                         |  664 -
 gfs-kernel/src/gfs/glops.h                         |   13 -
 gfs-kernel/src/gfs/incore.h                        | 1218 -
 gfs-kernel/src/gfs/inode.c                         | 2224 --
 gfs-kernel/src/gfs/inode.h                         |   57 -
 gfs-kernel/src/gfs/ioctl.c                         | 1607 -
 gfs-kernel/src/gfs/ioctl.h                         |    9 -
 gfs-kernel/src/gfs/lm.c                            |  237 -
 gfs-kernel/src/gfs/lm.h                            |   32 -
 gfs-kernel/src/gfs/lm_interface.h                  |  269 -
 gfs-kernel/src/gfs/lock_dlm.h                      |  173 -
 gfs-kernel/src/gfs/lock_dlm_lock.c                 |  518 -
 gfs-kernel/src/gfs/lock_dlm_main.c                 |   31 -
 gfs-kernel/src/gfs/lock_dlm_mount.c                |  278 -
 gfs-kernel/src/gfs/lock_dlm_sysfs.c                |  229 -
 gfs-kernel/src/gfs/lock_dlm_thread.c               |  358 -
 gfs-kernel/src/gfs/lock_nolock_main.c              |  221 -
 gfs-kernel/src/gfs/locking.c                       |  171 -
 gfs-kernel/src/gfs/log.c                           | 1424 -
 gfs-kernel/src/gfs/log.h                           |   66 -
 gfs-kernel/src/gfs/lops.c                          | 1649 --
 gfs-kernel/src/gfs/lops.h                          |  166 -
 gfs-kernel/src/gfs/lvb.c                           |  135 -
 gfs-kernel/src/gfs/lvb.h                           |   53 -
 gfs-kernel/src/gfs/main.c                          |  134 -
 gfs-kernel/src/gfs/mount.c                         |  209 -
 gfs-kernel/src/gfs/mount.h                         |    6 -
 gfs-kernel/src/gfs/ondisk.c                        |   15 -
 gfs-kernel/src/gfs/ops_address.c                   |  504 -
 gfs-kernel/src/gfs/ops_address.h                   |    6 -
 gfs-kernel/src/gfs/ops_dentry.c                    |  111 -
 gfs-kernel/src/gfs/ops_dentry.h                    |    6 -
 gfs-kernel/src/gfs/ops_export.c                    |  395 -
 gfs-kernel/src/gfs/ops_export.h                    |    6 -
 gfs-kernel/src/gfs/ops_file.c                      | 1913 --
 gfs-kernel/src/gfs/ops_file.h                      |   11 -
 gfs-kernel/src/gfs/ops_fstype.c                    |  828 -
 gfs-kernel/src/gfs/ops_fstype.h                    |   13 -
 gfs-kernel/src/gfs/ops_inode.c                     | 1680 --
 gfs-kernel/src/gfs/ops_inode.h                     |    9 -
 gfs-kernel/src/gfs/ops_super.c                     |  463 -
 gfs-kernel/src/gfs/ops_super.h                     |    6 -
 gfs-kernel/src/gfs/ops_vm.c                        |  233 -
 gfs-kernel/src/gfs/ops_vm.h                        |    7 -
 gfs-kernel/src/gfs/page.c                          |  266 -
 gfs-kernel/src/gfs/page.h                          |   13 -
 gfs-kernel/src/gfs/proc.c                          |  490 -
 gfs-kernel/src/gfs/proc.h                          |   14 -
 gfs-kernel/src/gfs/quota.c                         | 1140 -
 gfs-kernel/src/gfs/quota.h                         |   28 -
 gfs-kernel/src/gfs/recovery.c                      |  780 -
 gfs-kernel/src/gfs/recovery.h                      |   23 -
 gfs-kernel/src/gfs/rgrp.c                          | 2152 --
 gfs-kernel/src/gfs/rgrp.h                          |   75 -
 gfs-kernel/src/gfs/super.c                         | 1274 -
 gfs-kernel/src/gfs/super.h                         |   54 -
 gfs-kernel/src/gfs/sys.c                           |  145 -
 gfs-kernel/src/gfs/sys.h                           |   14 -
 gfs-kernel/src/gfs/trans.c                         |  453 -
 gfs-kernel/src/gfs/trans.h                         |   24 -
 gfs-kernel/src/gfs/unlinked.c                      |  432 -
 gfs-kernel/src/gfs/unlinked.h                      |   19 -
 gfs-kernel/src/gfs/util.c                          |  590 -
 gfs-kernel/src/gfs/util.h                          |  330 -
 gfs/Makefile                                       |   23 -
 gfs/gfs_debug/Makefile                             |   32 -
 gfs/gfs_debug/basic.c                              |  436 -
 gfs/gfs_debug/basic.h                              |   26 -
 gfs/gfs_debug/block_device.c                       |  117 -
 gfs/gfs_debug/block_device.h                       |   14 -
 gfs/gfs_debug/gfs_debug.h                          |   83 -
 gfs/gfs_debug/main.c                               |  179 -
 gfs/gfs_debug/ondisk.c                             |   18 -
 gfs/gfs_debug/readfile.c                           |  236 -
 gfs/gfs_debug/readfile.h                           |   14 -
 gfs/gfs_debug/util.c                               |  334 -
 gfs/gfs_debug/util.h                               |   29 -
 gfs/gfs_fsck/FEATURES                              |   25 -
 gfs/gfs_fsck/Makefile                              |   60 -
 gfs/gfs_fsck/TODO                                  |   49 -
 gfs/gfs_fsck/bio.c                                 |  168 -
 gfs/gfs_fsck/bio.h                                 |   23 -
 gfs/gfs_fsck/bitmap.c                              |  118 -
 gfs/gfs_fsck/bitmap.h                              |   20 -
 gfs/gfs_fsck/block_list.c                          |  283 -
 gfs/gfs_fsck/block_list.h                          |   89 -
 gfs/gfs_fsck/eattr.c                               |  100 -
 gfs/gfs_fsck/eattr.h                               |   21 -
 gfs/gfs_fsck/file.c                                |  231 -
 gfs/gfs_fsck/file.h                                |   10 -
 gfs/gfs_fsck/fs_bits.c                             |  350 -
 gfs/gfs_fsck/fs_bits.h                             |   34 -
 gfs/gfs_fsck/fs_bmap.c                             |  529 -
 gfs/gfs_fsck/fs_bmap.h                             |   10 -
 gfs/gfs_fsck/fs_dir.c                              | 1775 --
 gfs/gfs_fsck/fs_dir.h                              |   35 -
 gfs/gfs_fsck/fs_inode.c                            |  602 -
 gfs/gfs_fsck/fs_inode.h                            |   22 -
 gfs/gfs_fsck/fs_recovery.c                         |   75 -
 gfs/gfs_fsck/fs_recovery.h                         |    9 -
 gfs/gfs_fsck/fsck.h                                |   49 -
 gfs/gfs_fsck/fsck_incore.h                         |  137 -
 gfs/gfs_fsck/hash.c                                |   91 -
 gfs/gfs_fsck/hash.h                                |    7 -
 gfs/gfs_fsck/initialize.c                          |  421 -
 gfs/gfs_fsck/inode.c                               |  335 -
 gfs/gfs_fsck/inode.h                               |   13 -
 gfs/gfs_fsck/inode_hash.c                          |   74 -
 gfs/gfs_fsck/inode_hash.h                          |    7 -
 gfs/gfs_fsck/link.c                                |   94 -
 gfs/gfs_fsck/link.h                                |    8 -
 gfs/gfs_fsck/log.c                                 |  148 -
 gfs/gfs_fsck/log.h                                 |   87 -
 gfs/gfs_fsck/lost_n_found.c                        |  133 -
 gfs/gfs_fsck/lost_n_found.h                        |    8 -
 gfs/gfs_fsck/main.c                                |  290 -
 gfs/gfs_fsck/metawalk.c                            | 1088 -
 gfs/gfs_fsck/metawalk.h                            |   78 -
 gfs/gfs_fsck/ondisk.c                              | 1342 -
 gfs/gfs_fsck/ondisk.h                              | 2045 --
 gfs/gfs_fsck/pass1.c                               | 1124 -
 gfs/gfs_fsck/pass1b.c                              |  563 -
 gfs/gfs_fsck/pass1c.c                              |  290 -
 gfs/gfs_fsck/pass2.c                               |  962 -
 gfs/gfs_fsck/pass3.c                               |  281 -
 gfs/gfs_fsck/pass4.c                               |  233 -
 gfs/gfs_fsck/pass5.c                               |  394 -
 gfs/gfs_fsck/rgrp.c                                |  633 -
 gfs/gfs_fsck/rgrp.h                                |   20 -
 gfs/gfs_fsck/super.c                               | 1435 -
 gfs/gfs_fsck/super.h                               |   11 -
 gfs/gfs_fsck/util.c                                |  333 -
 gfs/gfs_fsck/util.h                                |   27 -
 gfs/gfs_grow/Makefile                              |   34 -
 gfs/gfs_grow/main.c                                |  974 -
 gfs/gfs_grow/ondisk.c                              |   18 -
 gfs/gfs_jadd/Makefile                              |   34 -
 gfs/gfs_jadd/main.c                                |  928 -
 gfs/gfs_jadd/ondisk.c                              |   18 -
 gfs/gfs_mkfs/Makefile                              |   38 -
 gfs/gfs_mkfs/device_geometry.c                     |  153 -
 gfs/gfs_mkfs/fs_geometry.c                         |  180 -
 gfs/gfs_mkfs/locking.c                             |  102 -
 gfs/gfs_mkfs/main.c                                |  504 -
 gfs/gfs_mkfs/mkfs_gfs.h                            |  181 -
 gfs/gfs_mkfs/ondisk.c                              |   17 -
 gfs/gfs_mkfs/structures.c                          |  845 -
 gfs/gfs_quota/Makefile                             |   31 -
 gfs/gfs_quota/check.c                              |  651 -
 gfs/gfs_quota/gfs_quota.h                          |   98 -
 gfs/gfs_quota/layout.c                             |  601 -
 gfs/gfs_quota/main.c                               |  759 -
 gfs/gfs_quota/names.c                              |   84 -
 gfs/gfs_quota/ondisk.c                             |   18 -
 gfs/gfs_tool/Makefile                              |   35 -
 gfs/gfs_tool/counters.c                            |  204 -
 gfs/gfs_tool/decipher_lockstate_dump               |  172 -
 gfs/gfs_tool/df.c                                  |  318 -
 gfs/gfs_tool/gfs_tool.h                            |   94 -
 gfs/gfs_tool/layout.c                              |  845 -
 gfs/gfs_tool/main.c                                |  274 -
 gfs/gfs_tool/misc.c                                |  755 -
 gfs/gfs_tool/ondisk.c                              |   21 -
 gfs/gfs_tool/parse_lockdump                        |  158 -
 gfs/gfs_tool/sb.c                                  |  152 -
 gfs/gfs_tool/tune.c                                |  141 -
 gfs/gfs_tool/util.c                                |  272 -
 gfs/include/global.h                               |   42 -
 gfs/include/linux_endian.h                         |   68 -
 gfs/include/list.h                                 |  325 -
 gfs/include/osi_list.h                             |   84 -
 gfs/include/osi_user.h                             |  421 -
 gfs/init.d/Makefile                                |   18 -
 gfs/init.d/gfs.in                                  |  148 -
 gfs/libgfs/Makefile                                |   33 -
 gfs/libgfs/bio.c                                   |  167 -
 gfs/libgfs/bitmap.c                                |  116 -
 gfs/libgfs/block_list.c                            |  267 -
 gfs/libgfs/file.c                                  |  233 -
 gfs/libgfs/fs_bits.c                               |  348 -
 gfs/libgfs/fs_bmap.c                               |  522 -
 gfs/libgfs/fs_dir.c                                | 1683 --
 gfs/libgfs/fs_inode.c                              |  470 -
 gfs/libgfs/incore.h                                | 1271 -
 gfs/libgfs/inode.c                                 |  322 -
 gfs/libgfs/libgfs.h                                |  398 -
 gfs/libgfs/log.c                                   |  139 -
 gfs/libgfs/ondisk.c                                | 1282 -
 gfs/libgfs/rgrp.c                                  |  593 -
 gfs/libgfs/size.c                                  |   81 -
 gfs/libgfs/super.c                                 |  530 -
 gfs/libgfs/util.c                                  |  271 -
 gfs/man/Makefile                                   |   18 -
 gfs/man/fsck.gfs.8                                 |   59 -
 gfs/man/gfs.8                                      |   37 -
 gfs/man/gfs_edit.8                                 |    1 -
 gfs/man/gfs_grow.8                                 |   63 -
 gfs/man/gfs_jadd.8                                 |   75 -
 gfs/man/gfs_quota.8                                |  101 -
 gfs/man/gfs_tool.8                                 |  145 -
 gfs/man/mkfs.gfs.8                                 |   82 -
 gfs/man/mount.gfs.8                                |  193 -
 gfs/tests/Makefile                                 |    4 -
 gfs/tests/filecon2/Makefile                        |   19 -
 gfs/tests/filecon2/filecon2.h                      |  146 -
 gfs/tests/filecon2/filecon2_client.c               |  841 -
 gfs/tests/filecon2/filecon2_server.c               |  597 -
 gfs/tests/mmdd/Makefile                            |   25 -
 gfs/tests/mmdd/mmdd.c                              |  703 -
 gfs2/convert/gfs2_convert.c                        |  480 +-
 gfs2/edit/Makefile                                 |    1 +
 gfs2/edit/extended.c                               |  700 +
 gfs2/edit/extended.h                               |    8 +
 gfs2/edit/gfs2hex.c                                |   79 +-
 gfs2/edit/gfs2hex.h                                |   14 +-
 gfs2/edit/hexedit.c                                | 1673 +-
 gfs2/edit/hexedit.h                                |   78 +-
 gfs2/edit/savemeta.c                               |  190 +-
 gfs2/fsck/fs_bits.h                                |   11 -
 gfs2/fsck/fs_recovery.c                            |   55 +-
 gfs2/fsck/fs_recovery.h                            |    7 +-
 gfs2/fsck/fsck.h                                   |    5 +-
 gfs2/fsck/initialize.c                             |   32 +-
 gfs2/fsck/link.c                                   |    8 +
 gfs2/fsck/lost_n_found.c                           |   18 +-
 gfs2/fsck/main.c                                   |    3 +-
 gfs2/fsck/metawalk.c                               |  225 +-
 gfs2/fsck/metawalk.h                               |    6 +-
 gfs2/fsck/pass1.c                                  |  170 +-
 gfs2/fsck/pass1b.c                                 |   15 +-
 gfs2/fsck/pass2.c                                  |   12 +
 gfs2/fsck/pass5.c                                  |    1 -
 gfs2/fsck/rgrepair.c                               |  645 +-
 gfs2/init.d/gfs2.in                                |   63 +-
 gfs2/libgfs2/fs_bits.c                             |  123 +-
 gfs2/libgfs2/fs_geometry.c                         |   44 +-
 gfs2/libgfs2/fs_ops.c                              |   12 +-
 gfs2/libgfs2/libgfs2.h                             |   12 +-
 gfs2/libgfs2/misc.c                                |   27 +-
 gfs2/libgfs2/ondisk.c                              |    6 +-
 gfs2/libgfs2/rgrp.c                                |   38 +-
 gfs2/libgfs2/structures.c                          |   32 +-
 gfs2/libgfs2/super.c                               |   47 +-
 gfs2/man/gfs2_convert.8                            |   38 +-
 gfs2/man/mkfs.gfs2.8                               |    5 +
 gfs2/mkfs/main_grow.c                              |   18 +
 gfs2/mkfs/main_mkfs.c                              |   35 +
 gfs2/mount/gfs_ondisk.h                            | 1904 ++
 gfs2/mount/mount.gfs2.c                            |    1 +
 gfs2/mount/mtab.c                                  |    2 +-
 gfs2/mount/util.c                                  |    4 +-
 gfs2/mount/util.h                                  |    1 +
 group/dlm_controld/Makefile                        |   58 +-
 group/dlm_controld/config.h                        |    2 +-
 group/dlm_controld/cpg.c                           |   66 +-
 group/dlm_controld/dlm_daemon.h                    |    1 +
 group/dlm_controld/main.c                          |   11 +
 group/dlm_controld/pacemaker.c                     |  362 -
 group/dlm_controld/plock.c                         |  130 +-
 group/gfs_controld/Makefile                        |   36 +-
 group/gfs_controld/config.h                        |    2 +-
 group/gfs_controld/cpg-old.c                       |    9 +
 group/gfs_controld/gfs_daemon.h                    |    1 +
 group/gfs_controld/member_pcmk.c                   |  113 -
 group/gfs_controld/plock.c                         |   39 +-
 group/man/dlm_controld.8                           |    4 +-
 group/man/gfs_controld.8                           |    4 +-
 make/defines.mk.input                              |   19 +-
 make/fencebuild.mk                                 |   43 -
 make/install.mk                                    |   16 +-
 make/release.mk                                    |   70 +-
 make/uninstall.mk                                  |   12 +-
 rgmanager/include/event.h                          |    2 +
 rgmanager/include/groups.h                         |    2 +-
 rgmanager/include/platform.h                       |    3 +
 rgmanager/include/res-ocf.h                        |    2 +
 rgmanager/include/resgroup.h                       |   27 +-
 rgmanager/include/reslist.h                        |    6 +
 rgmanager/include/rg_dbus.h                        |   20 +
 rgmanager/init.d/rgmanager.in                      |    5 +
 rgmanager/man/clulog.8                             |   18 +-
 rgmanager/man/clusvcadm.8                          |    9 +
 rgmanager/man/rgmanager.8                          |  348 +-
 rgmanager/src/Makefile                             |    6 +-
 rgmanager/src/clulib/rg_strings.c                  |   15 +-
 rgmanager/src/daemons/Makefile                     |    9 +-
 rgmanager/src/daemons/fo_domain.c                  |    2 +-
 rgmanager/src/daemons/groups.c                     |   17 +-
 rgmanager/src/daemons/main.c                       |   34 +-
 rgmanager/src/daemons/reslist.c                    |   97 +
 rgmanager/src/daemons/resrules.c                   |   10 +-
 rgmanager/src/daemons/restree.c                    |  254 +-
 rgmanager/src/daemons/rg_event.c                   |    7 +
 rgmanager/src/daemons/rg_state.c                   |  160 +-
 rgmanager/src/daemons/rg_thread.c                  |   20 +
 rgmanager/src/daemons/service_op.c                 |   84 +
 rgmanager/src/daemons/slang_event.c                |   18 +-
 rgmanager/src/daemons/test.c                       |    3 +
 rgmanager/src/daemons/update-dbus.c                |  266 +
 rgmanager/src/daemons/watchdog.c                   |   20 +
 rgmanager/src/resources/ASEHAagent.sh              |  900 -
 rgmanager/src/resources/Makefile                   |  109 +-
 rgmanager/src/resources/SAPDatabase                | 1025 -
 rgmanager/src/resources/SAPInstance                |  591 -
 rgmanager/src/resources/apache.metadata            |   95 -
 rgmanager/src/resources/apache.sh                  |  255 -
 rgmanager/src/resources/clusterfs.sh               |  275 -
 rgmanager/src/resources/default_event_script.sl    |   24 +
 rgmanager/src/resources/drbd.metadata              |   51 -
 rgmanager/src/resources/drbd.sh                    |  144 -
 rgmanager/src/resources/fs.sh.in                   |  443 -
 rgmanager/src/resources/ip.sh                      |  970 -
 rgmanager/src/resources/lvm.metadata               |   86 -
 rgmanager/src/resources/lvm.sh                     |  134 -
 rgmanager/src/resources/lvm_by_lv.sh               |  415 -
 rgmanager/src/resources/lvm_by_vg.sh               |  401 -
 rgmanager/src/resources/mysql.metadata             |  106 -
 rgmanager/src/resources/mysql.sh                   |  174 -
 rgmanager/src/resources/named.metadata             |  104 -
 rgmanager/src/resources/named.sh                   |  193 -
 rgmanager/src/resources/netfs.sh                   |  376 -
 rgmanager/src/resources/nfsclient.sh               |  445 -
 rgmanager/src/resources/nfsexport.sh               |  238 -
 rgmanager/src/resources/nfsserver.sh               |  409 -
 rgmanager/src/resources/ocf-shellfuncs             |  165 -
 rgmanager/src/resources/openldap.metadata          |   98 -
 rgmanager/src/resources/openldap.sh                |  209 -
 rgmanager/src/resources/oracledb.sh.in             |  886 -
 rgmanager/src/resources/postgres-8.metadata        |   95 -
 rgmanager/src/resources/postgres-8.sh              |  204 -
 rgmanager/src/resources/ra-api-1-modified.dtd      |   68 -
 rgmanager/src/resources/ra2man.xsl                 |  158 -
 rgmanager/src/resources/ra2ref.xsl                 |   10 -
 rgmanager/src/resources/ra2rng.xsl                 |   49 -
 rgmanager/src/resources/resources.rng.head         |    1 -
 rgmanager/src/resources/resources.rng.mid          |    4 -
 rgmanager/src/resources/resources.rng.tail         |   32 -
 rgmanager/src/resources/samba.metadata             |   89 -
 rgmanager/src/resources/samba.sh                   |  223 -
 rgmanager/src/resources/script.sh                  |  103 -
 rgmanager/src/resources/service.sh                 |  296 -
 rgmanager/src/resources/smb.sh                     |  677 -
 rgmanager/src/resources/svclib_nfslock             |  260 -
 rgmanager/src/resources/tomcat-5.metadata          |  104 -
 rgmanager/src/resources/tomcat-5.sh                |  256 -
 rgmanager/src/resources/utils/config-utils.sh.in   |  236 -
 rgmanager/src/resources/utils/fs-lib.sh            |  942 -
 .../src/resources/utils/httpd-parse-config.pl      |   65 -
 rgmanager/src/resources/utils/member_util.sh       |   66 -
 rgmanager/src/resources/utils/messages.sh          |  243 -
 .../src/resources/utils/named-parse-config.pl      |   26 -
 rgmanager/src/resources/utils/ra-skelet.sh         |   79 -
 .../src/resources/utils/tomcat-parse-config.pl     |   45 -
 rgmanager/src/resources/vm.sh                      | 1000 -
 rgmanager/src/utils/clufindhostname.c              |    8 +-
 rgmanager/src/utils/clulog.c                       |   41 +-
 rgmanager/src/utils/clustat.c                      |   76 +-
 rgmanager/src/utils/clusvcadm.c                    |   10 +-
 scripts/fenceparse                                 |   42 -
 552 files changed, 10872 insertions(+), 150074 deletions(-)