Abhijith Das (5):
      gfs2_quota: Fix gfs2_quota to handle boundary conditions
      gfs2_convert: gfs2_convert segfaults when converting filesystems of blocksize 512 bytes
      gfs2_convert: gfs2_convert uses too much memory for jdata conversion
      gfs2_convert: Fix conversion of gfs1 CDPNs
      gfs2_convert: Doesn't convert indirectly-pointed extended attributes correctly

Bob Peterson (3):
      gfs2: GFS2 utilities should make use of exported device topology
      cman: gfs_controld dm suspend hangs withdrawn GFS file system
      GFS2: fsck.gfs2 segfault - osi_tree "each_safe" patch

Christine Caulfield (3):
      cman: Add improved cluster_id hash function
      cman: move fnv hash function into its own file
      ccs: Remove non-existant commands from ccs_tool man page.

David Teigland (7):
      dlm_controld/libdlmcontrol/dlm_tool: separate plock debug buffer
      dlm_controld: add more fs_notified debugging
      dlm_controld/gfs_controld: avoid full plock unlock when no resource exists
      dlm_controld: add plock checkpoint signatures
      dlm_controld: set last_plock_time for ownership operations
      dlm_controld: don't skip unlinking checkpoint
      gfs_controld: set last_plock_time for ownership operations

Fabio M. Di Nitto (1):
      dlm: bump libdlmcontrol sominor

Jan Friesse (1):
      fencing: SNMP fence agents don't fail

Lon Hohberger (4):
      config: Add hash_cluster_id to schema
      rgmanager: Fix 2+ simultaneous relocation crash
      rgmanager: Fix memory leaks during relocation
      rgmanager: Fix tiny memory leak during reconfig

Marek 'marx' Grac (1):
      fencing: Remove 'ipport' option from WTI fence agent

 cman/daemon/Makefile                 |    3 +-
 cman/daemon/cman-preconfig.c         |   32 +++-
 cman/daemon/fnvhash.c                |   93 +++++++++
 cman/daemon/fnvhash.h                |    1 +
 config/plugins/ldap/99cluster.ldif   |   10 +-
 config/plugins/ldap/ldap-base.csv    |    3 +-
 config/tools/man/ccs_tool.8          |   15 +--
 config/tools/xml/cluster.rng.in      |    3 +
 dlm/libdlmcontrol/Makefile           |    2 +
 dlm/libdlmcontrol/libdlmcontrol.h    |    1 +
 dlm/libdlmcontrol/main.c             |    5 +
 dlm/man/dlm_tool.8                   |    4 +
 dlm/tool/main.c                      |   25 +++-
 doc/COPYRIGHT                        |    6 +
 fence/agents/lib/fencing_snmp.py.py  |   13 +-
 fence/agents/wti/fence_wti.py        |    2 +-
 gfs2/convert/gfs2_convert.c          |  377 ++++++++++++++++++++++++++++------
 gfs2/fsck/link.c                     |    2 -
 gfs2/fsck/pass1b.c                   |   10 +-
 gfs2/fsck/pass3.c                    |    5 +-
 gfs2/fsck/pass4.c                    |    5 +-
 gfs2/libgfs2/device_geometry.c       |   38 ++++-
 gfs2/libgfs2/fs_ops.c                |    1 +
 gfs2/libgfs2/libgfs2.h               |   10 +
 gfs2/mkfs/main_mkfs.c                |   69 ++++++-
 gfs2/quota/check.c                   |    3 +-
 gfs2/quota/main.c                    |  104 +++-------
 group/dlm_controld/cpg.c             |   62 ++++--
 group/dlm_controld/dlm_controld.h    |    1 +
 group/dlm_controld/dlm_daemon.h      |   44 +++-
 group/dlm_controld/main.c            |   60 +++++-
 group/dlm_controld/plock.c           |  241 ++++++++++++++--------
 group/gfs_controld/plock.c           |   12 +-
 group/gfs_controld/util.c            |    3 +-
 rgmanager/src/daemons/event_config.c |    2 +
 rgmanager/src/daemons/rg_state.c     |    2 +
 rgmanager/src/daemons/rg_thread.c    |    4 +-
 37 files changed, 967 insertions(+), 306 deletions(-)