Abhijith Das (1):
      gfs2_convert: gfs2_convert doesn't resume after interrupted conversion

Bob Peterson (4):
      Updating /proc/mounts and /etc/mtab with mount args for GFS2 fs
      Reported UUID from 'gfs2_edit -p sb' should be lower-case
      fsck.gfs2 truncates directories with more than 100,000 entries
      GFS2: fsck.gfs2 seems to process large files twice

Christine Caulfield (1):
      cman: Calculate expected_votes correctly after leave remove

Fabio M. Di Nitto (2):
      cman init: fix "stop remove" operation
      cman: fix startup race condition when configs are different across nodes

Jan Friesse (4):
      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

Lon Hohberger (25):
      config: Add hints for more fencing agents to cluster.rng
      rgmanager: Add resource-defaults section
      config: Add resource-defaults section
      config: Add resource-defaults to ldif
      doc: Update autogenerated doc for resource-defaults
      resource-agents: Stop using '-' as 1st char of log messages
      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
      config: Add independent subtree restart tolerances
      rgmanager: clean up independent subtree restart handling
      rgmanager: Fix corner case in critical/non-critical handling
      cman: Make qdiskd heuristics time out

Madison Kelly (1):
      Added detail to Node Assassin fence agent (fence_na) copyright.

Marek 'marx' Grac (4):
      fence_rhevm: New fence agent for RHEV-M REST API
      fence_cisco_ucs: New fence agent for Cisco UCS
      rgmanager: tomcat-5 can't start properly
      resource-agents: fix utility to obtain data from ccs_tool

 cman/cman_tool/join.c                            |   38 +++--
 cman/daemon/cman.h                               |    2 +-
 cman/daemon/commands.c                           |    2 +
 cman/daemon/daemon.c                             |   11 +-
 cman/init.d/cman.in                              |   21 ++-
 cman/man/qdisk.5                                 |    8 +-
 cman/qdisk/main.c                                |    6 +-
 cman/qdisk/score.c                               |   92 ++++++++--
 cman/qdisk/score.h                               |    7 +-
 config/plugins/ldap/99cluster.ldif               |    7 +-
 config/plugins/ldap/ldap-base.csv                |    3 +-
 config/tools/xml/cluster.rng.in                  |  179 +++++++++++++++++-
 doc/COPYRIGHT                                    |    1 +
 doc/cluster_conf.html                            |   12 +-
 fence/agents/cisco_ucs/Makefile                  |    7 +
 fence/agents/cisco_ucs/fence_cisco_ucs.py        |  138 ++++++++++++++
 fence/agents/lib/fencing.py.py                   |    8 +-
 fence/agents/rhevm/Makefile                      |    7 +
 fence/agents/rhevm/fence_rhevm.py                |  145 +++++++++++++++
 gfs2/convert/gfs2_convert.c                      |    9 +-
 gfs2/fsck/link.c                                 |    8 +
 gfs2/fsck/lost_n_found.c                         |   18 ++-
 gfs2/fsck/metawalk.c                             |  178 +++++++++---------
 gfs2/fsck/metawalk.h                             |    1 +
 gfs2/fsck/pass1.c                                |   16 ++-
 gfs2/libgfs2/fs_ops.c                            |   12 +-
 gfs2/libgfs2/ondisk.c                            |    2 +-
 gfs2/mount/mount.gfs2.c                          |    1 +
 gfs2/mount/mtab.c                                |    2 +-
 gfs2/mount/util.c                                |    4 +-
 gfs2/mount/util.h                                |    1 +
 rgmanager/include/event.h                        |    1 +
 rgmanager/include/res-ocf.h                      |    1 +
 rgmanager/include/resgroup.h                     |    5 +
 rgmanager/include/reslist.h                      |    6 +
 rgmanager/man/clusvcadm.8                        |    9 +
 rgmanager/src/clulib/rg_strings.c                |   15 ++-
 rgmanager/src/daemons/groups.c                   |    5 +
 rgmanager/src/daemons/reslist.c                  |   97 ++++++++++
 rgmanager/src/daemons/resrules.c                 |   10 +-
 rgmanager/src/daemons/restree.c                  |  217 ++++++++++++++++++----
 rgmanager/src/daemons/rg_state.c                 |  154 ++++++++++++++--
 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/resources/default_event_script.sl  |    4 +
 rgmanager/src/resources/lvm.sh                   |    8 +-
 rgmanager/src/resources/ra2rng.xsl               |    6 +
 rgmanager/src/resources/tomcat-5.sh              |   12 +-
 rgmanager/src/resources/utils/config-utils.sh.in |    6 +
 rgmanager/src/utils/clustat.c                    |   11 +-
 rgmanager/src/utils/clusvcadm.c                  |   10 +-
 53 files changed, 1416 insertions(+), 232 deletions(-)