<pre>Abhijith Das (2):
      libgfs2: fix build break caused by patch to bz 455300
      gfs2_convert: Does not convert full gfs1 filesystems

Bob Peterson (1):
      gfs2_fsck segfault when statfs system file is missing

Christine Caulfield (1):
      cman: make libcman /dev/zero fd close-on-exec

David Teigland (1):
      dlm_controld: don&#39;t log errors after disabling plocks

Fabio M. Di Nitto (2):
      fence-agents: fix build with locales other than C
      fence_ilo_mp: fix release version

Lon Hohberger (4):
      Revert &#34;resource-agents: Kill correct PIDs during force_unmount&#34;
      rgmanager: Kill processes correctly w/ force_unmount
      rgmanager: Allow spaces in fs.sh mount points
      rgmanager: Minor cleanups for file system agents

Marek &#39;marx&#39; Grac (3):
      fence_egenera: log file path should be absolute not relative
      fence_ilo_mp: Proper error message instead of python traceback
      fencing: Creating manual pages fails when default value is a list

 cman/lib/libcman.c                    |    1 +
 fence/agents/egenera/fence_egenera.pl |    6 +-
 fence/agents/ilo_mp/fence_ilo_mp.py   |   50 ++-
 fence/agents/lib/fencing.py.py        |    4 +-
 gfs2/convert/gfs2_convert.c           |  106 ++++++
 gfs2/edit/hexedit.c                   |    4 +-
 gfs2/edit/savemeta.c                  |    4 +-
 gfs2/fsck/fs_recovery.c               |    2 -
 gfs2/fsck/fsck.h                      |    9 +-
 gfs2/fsck/initialize.c                |  661 +++++++++++++++++++++++++++++++--
 gfs2/fsck/main.c                      |  114 ------
 gfs2/fsck/metawalk.c                  |    3 +-
 gfs2/fsck/metawalk.h                  |    2 +
 gfs2/fsck/pass1.c                     |  410 ++++++++++++++++-----
 gfs2/fsck/rgrepair.c                  |   59 +++-
 gfs2/libgfs2/fs_ops.c                 |    2 +-
 gfs2/libgfs2/libgfs2.h                |    9 +-
 gfs2/libgfs2/misc.c                   |   45 +++
 gfs2/libgfs2/ondisk.c                 |    6 +-
 gfs2/libgfs2/rgrp.c                   |    4 +-
 gfs2/libgfs2/structures.c             |   26 +-
 gfs2/libgfs2/super.c                  |   27 ++-
 gfs2/mkfs/main_grow.c                 |    4 +-
 gfs2/mkfs/main_mkfs.c                 |   44 ---
 group/dlm_controld/cpg.c              |   20 +-
 rgmanager/src/resources/clusterfs.sh  |  135 +------
 rgmanager/src/resources/fs.sh.in      |  174 ++--------
 rgmanager/src/resources/netfs.sh      |  136 +------
 scripts/fenceparse                    |    2 +
 29 files changed, 1332 insertions(+), 737 deletions(-)
</pre>