<pre>Christine Caulfield (2):
      Use new corosync confdb API to remove string limit.
      ccs: Don&#39;t truncate lists

David Teigland (1):
      fenced: fix log file mode

Fabio M. Di Nitto (10):
      cman-preconfig: allow host aliases as valid cluster nodenames
      cman: fix data copy and memory leak when reloading config
      cman: fix a couple of comments
      qdiskd: allow master to failover quickly when using master_wins
      cman init: clarify better comments for FENCE_JOIN=no
      cman init: allow dlm hash table sizes to be tunable at startup
      qdiskd: restrict master_wins to 2 node cluster
      build: rename .d files to .Tpo and extend header tracking
      update .gitignore
      cman init: reorder cmannotifyd startup and allow breakpoints to be configurable

Jan PokornÃ½ (1):
      rgmanager: resrules: make expand_time buffer-less

Lon Hohberger (1):
      qdisk: Report non-zero exit codes from heuristic

Ryan McCabe (1):
      rgmanager: Fix for services stuck in recovery

 .gitignore                               |   56 ++++++++++++--
 cman/cman_tool/Makefile                  |    2 +-
 cman/cman_tool/main.c                    |   11 ++-
 cman/daemon/Makefile                     |    4 +-
 cman/daemon/cman-preconfig.c             |  122 +++++++++++++++++++++++++----
 cman/init.d/cman.in                      |   61 +++++++++++++--
 cman/init.d/cman.init.defaults.in        |   27 ++++++-
 cman/man/qdisk.5                         |    5 +-
 cman/notifyd/Makefile                    |    2 +-
 cman/qdisk/Makefile                      |    6 +-
 cman/qdisk/disk.h                        |    6 +-
 cman/qdisk/main.c                        |   94 +++++++++++++++++++++--
 cman/qdisk/score.c                       |    2 +
 config/libs/libccsconfdb/fullxpath.c     |   22 ++++--
 config/libs/libccsconfdb/xpathlite.c     |   62 ++++++++++-----
 config/plugins/ldap/Makefile             |    2 +-
 config/plugins/xml/Makefile              |    2 +-
 config/tools/ccs_tool/Makefile           |    2 +-
 config/tools/ldap/Makefile               |    2 +-
 config/tools/ldap/confdb2ldif.c          |   15 ++--
 config/tools/ldap/rng2ldif/Makefile      |    6 +-
 config/tools/xml/ccs_config_dump.c       |   17 +++--
 configure                                |    2 +-
 dlm/tool/Makefile                        |    2 +-
 fence/fence_node/Makefile                |    2 +-
 fence/fence_tool/Makefile                |    2 +-
 fence/fenced/Makefile                    |    2 +-
 fence/fenced/logging.c                   |   31 ++++++++
 fence/fenced/main.c                      |    1 -
 group/daemon/Makefile                    |    2 +-
 group/dlm_controld/Makefile              |    2 +-
 make/clean.mk                            |    2 +-
 make/libs.mk                             |    2 +-
 rgmanager/include/reslist.h              |    2 +-
 rgmanager/src/clulib/Makefile            |    4 +-
 rgmanager/src/daemons/Makefile           |   19 ++++-
 rgmanager/src/daemons/groups.c           |    6 +-
 rgmanager/src/daemons/resrules.c         |   74 ++++++++++++-------
 rgmanager/src/daemons/test-expand-time.c |   25 ++++++
 rgmanager/src/utils/Makefile             |   10 +-
 40 files changed, 559 insertions(+), 159 deletions(-)
</pre>