Abhijith Das (3):
      gfs2_quota: Keep quota file length always sizeof(struct gfs2_quota) aligned
      Merge branch 'STABLE3' of ssh://git.fedoraproject.org/git/cluster into mySTABLE3
      gfs2_convert: gfs2_convert doesn't convert quota files

Andrew Beekhof (1):
      dlm_controld.pcmk: Prevent use-of-NULL by checking the node has a valid address before adding it to configfs

Christine Caulfield (2):
      Make totem.fail_to_recv_const default to 2500
      cman: fix name of fail_recv_const

David Teigland (1):
      gfs_controld: fix do_leave arg

Jonathan Brassow (1):
      HA LVM: Use CLVM with local machine kernel targets (bz 585217)

Lon Hohberger (13):
      gfs2: Fix handling of mount points with spaces
      resource-agents: Clean up file system agents
      rgmanager: Fix resource start/check times
      rgmanager: Fix max_restart threshold handling
      rgmanager: Fix build warnings
      rgmanager: Add per-resource status check tolerances
      resource-agents: Add status_program attribute
      config: Update config schema
      config: Add fail_recv_const
      rgmanager: Do hard shut down if corosync dies
      rgmanager: Fix man pages
      qdiskd: Change votes instead of cman-visible status
      qdiskd: Change votes instead of cman-visible status

Steven Whitehouse (1):
      Merge branch 'STABLE3' of git://git.fedorahosted.org/cluster into STABLE3

 cman/daemon/cman-preconfig.c            |    5 +
 cman/qdisk/main.c                       |   63 ++-
 config/plugins/ldap/99cluster.ldif      |   74 ++-
 config/plugins/ldap/ldap-base.csv       |    6 +-
 config/tools/xml/cluster.rng.in         |  144 +++++
 gfs2/convert/gfs2_convert.c             |   49 ++-
 gfs2/mount/util.c                       |   55 ++-
 gfs2/quota/check.c                      |   80 ++-
 gfs2/quota/main.c                       |    2 +-
 group/dlm_controld/pacemaker.c          |    2 +-
 group/gfs_controld/main.c               |   11 +-
 rgmanager/include/groups.h              |    1 +
 rgmanager/include/reslist.h             |    2 +-
 rgmanager/man/Makefile                  |    2 +-
 rgmanager/man/clurgmgrd.8               |   42 +--
 rgmanager/man/clurmtabd.8               |   37 --
 rgmanager/man/rgmanager.8               |   43 ++
 rgmanager/src/clulib/msg_cluster.c      |    7 +-
 rgmanager/src/daemons/groups.c          |   16 +
 rgmanager/src/daemons/restart_counter.c |    5 +
 rgmanager/src/daemons/restree.c         |   50 ++-
 rgmanager/src/daemons/rg_state.c        |    6 +-
 rgmanager/src/daemons/slang_event.c     |   20 +-
 rgmanager/src/resources/Makefile        |    2 +-
 rgmanager/src/resources/clusterfs.sh    |  608 +-------------------
 rgmanager/src/resources/fs.sh.in        |  797 +-------------------------
 rgmanager/src/resources/lvm.sh          |   52 +--
 rgmanager/src/resources/lvm_by_lv.sh    |   75 +++-
 rgmanager/src/resources/lvm_by_vg.sh    |  147 +++++-
 rgmanager/src/resources/netfs.sh        |  368 ++-----------
 rgmanager/src/resources/ra2rng.xsl      |    8 +-
 rgmanager/src/resources/utils/fs-lib.sh |  942 +++++++++++++++++++++++++++++++
 rgmanager/src/resources/vm.sh           |   33 +-
 33 files changed, 1846 insertions(+), 1908 deletions(-)