Abhijith Das (1):
      gfs2 manual pages: gfs2_convert manpage and documentation updates

Bob Peterson (4):
      gfs2_edit restoremeta should not return 0 on failure
      fsck.gfs2: unaligned access on ia64
      GFS2: libgfs2 bitfit algorithm using wrong shift point
      Make gfs2_edit show bit-to-block translation when viewing bitmaps

Carlos Eduardo Maiolino (1):
      resource-agents: Remove nfs service temp directories

Christine Caulfield (2):
      cman: Recalculate expected_votes on a config reload.
      cman: Mention cman_tool version -S in man page

David Teigland (2):
      dlm_controld: fix plock checkpoint signatures
      dlm_controld: fix plock owner in checkpoints

Fabio M. Di Nitto (17):
      resource agents: Remove bashisms from resource scripts
      cman init: more LSB compliance
      rgmanger init: more LSB complaint bits
      cman: add default config snippet for cman init script
      gfs2 init: make the init script LSB compliant
      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
      cman-preconfig: better handle of logging reload operation
      cman-preconfig: better handle of logging reload operation (part 2)
      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: fix consensus calculation

Federico Simoncelli (1):
      config: Add missing cman_label

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

Jan Friesse (1):
      cman: check for new config only once per second

Lon Hohberger (37):
      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
      resource-agents: Make vm.sh use stop/start timeouts
      rgmanager: Use sysrq-b to reboot
      Revert "resource-agents: Make vm.sh use stop/start timeouts"
      resource-agents: Make vm.sh use stop/start timeouts
      resource-agents: fix incorrect link resolution in fs-lib
      rgmanager: Make clustat -f not query CCS/objdb
      resource-agents: Add NFSv4 support
      resource-agents: Add NFSv4 agent to installation
      config: Update cluster schema
      config: Update cluster LDIF schema
      doc: Add auto-generated cluster.conf reference
      doc: Install cluster.conf reference
      rgmanager: Make clulog filter correctly
      resource-agents: Add resource type to logging
      rgmanager: Man page improvements
      resource-agents: Allow other values for "yes"
      config: Allow multiple logging_daemon tags
      config: Add doc for cman_label attribute
      config: Update LDIF schema
      cman: Recalculate quorum on config change
      config: Add tomcat-6 resource agent to schema
      config: Add tomcat-6 to ldif schema
      doc: Add tomcat-6 to cluster_conf.html
      cman: Recalculate quorum on quorum device vote changes
      cman: Deprecate specifying config version to cman_tool
      config: Regenerate fencing definitions for XML schema
      config: Exclude fence_scsi from generated section

Marek 'marx' Grac (8):
      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
      resource-agents: RA for psql does not work correctly with netmask
      fence_ilo: will throw exception if user does not have power priviledges
      fencing: Not all parameters appear in metadata

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

Ryan O'Hara (1):
      Fix open flags so that logfile won't be truncated each time we open it.

 cman/cman_tool/main.c                              |   40 +-
 cman/daemon/cman-preconfig.c                       |  259 +++--
 cman/daemon/cmanconfig.c                           |    8 +-
 cman/daemon/commands.c                             |  194 ++--
 cman/init.d/Makefile                               |   10 +-
 cman/init.d/cman.in                                |   26 +-
 cman/init.d/cman.init.defaults.in                  |   97 ++
 cman/man/cman_tool.8                               |    7 +
 config/plugins/ldap/99cluster.ldif                 |   34 +-
 config/plugins/ldap/ldap-base.csv                  |    8 +-
 config/tools/xml/cluster.rng.in                    |  895 ++++++++-------
 doc/Makefile                                       |    3 +-
 doc/cluster_conf.html                              | 1184 ++++++++++++++++++++
 fence/agents/apc/fence_apc.py                      |    4 +-
 fence/agents/bladecenter_snmp/Makefile             |    7 +
 .../bladecenter_snmp/fence_bladecenter_snmp.py     |   88 ++
 fence/agents/ibmblade/Makefile                     |   15 +-
 fence/agents/ibmblade/fence_ibmblade.8             |    1 +
 fence/agents/ibmblade/fence_ibmblade.py            |   88 --
 fence/agents/ilo/fence_ilo.py                      |    7 +-
 fence/agents/lib/fencing.py.py                     |   12 +
 fence/agents/rsb/fence_rsb.py                      |    6 +-
 fence/agents/scsi/fence_scsi.pl                    |    2 +-
 fence/agents/wti/fence_wti.py                      |    6 +-
 gfs2/edit/hexedit.c                                |   63 +-
 gfs2/edit/savemeta.c                               |    2 +-
 gfs2/fsck/fs_bits.h                                |   11 -
 gfs2/fsck/pass5.c                                  |    1 -
 gfs2/init.d/gfs2.in                                |   63 +-
 gfs2/libgfs2/fs_bits.c                             |  115 ++-
 gfs2/libgfs2/libgfs2.h                             |    5 +-
 gfs2/libgfs2/rgrp.c                                |    6 +
 gfs2/man/gfs2_convert.8                            |   38 +-
 group/dlm_controld/plock.c                         |   10 +-
 rgmanager/include/res-ocf.h                        |    1 +
 rgmanager/init.d/rgmanager.in                      |    5 +
 rgmanager/man/clulog.8                             |   18 +-
 rgmanager/man/rgmanager.8                          |  346 ++++++-
 rgmanager/src/daemons/restree.c                    |   29 +-
 rgmanager/src/daemons/watchdog.c                   |   20 +
 rgmanager/src/resources/Makefile                   |    6 +-
 rgmanager/src/resources/SAPDatabase                |    2 +-
 rgmanager/src/resources/SAPInstance                |    2 +-
 rgmanager/src/resources/nfsserver.sh               |  180 +++-
 rgmanager/src/resources/ocf-shellfuncs             |    2 +-
 rgmanager/src/resources/postgres-8.sh              |    4 +-
 rgmanager/src/resources/ra2rng.xsl                 |   17 +-
 rgmanager/src/resources/resources.rng.mid          |    3 +-
 rgmanager/src/resources/resources.rng.tail         |   18 +-
 rgmanager/src/resources/service.sh                 |   52 +-
 rgmanager/src/resources/svclib_nfslock             |    4 +-
 rgmanager/src/resources/tomcat-6.metadata          |   74 ++
 rgmanager/src/resources/tomcat-6.sh                |  222 ++++
 rgmanager/src/resources/utils/config-utils.sh.in   |    4 +-
 rgmanager/src/resources/utils/fs-lib.sh            |   16 +-
 rgmanager/src/resources/utils/messages.sh          |    8 +
 rgmanager/src/resources/utils/ra-skelet.sh         |   40 +-
 rgmanager/src/resources/vm.sh                      |  150 ++-
 rgmanager/src/utils/clulog.c                       |   41 +-
 rgmanager/src/utils/clustat.c                      |    6 +-
 60 files changed, 3559 insertions(+), 1026 deletions(-)