David Teigland (1):
      dlm_controld: clear waiting plocks for closed files

Fabio M. Di Nitto (6):
      cman-preconfig: allow cman to configure corosync multicast ttl
      cman init: increse the default timeout waiting for quorum
      cman init: add config option to disable _controld daemons startup
      config: add more totem options to relax ng schema for config validation
      cman preconfig: fix segfault if we cannot determine cluster name
      rgmanager: re-add slang scripts where they belong

Lon Hohberger (5):
      qdiskd: Fix bad timer check
      cman: Don't increment on LEAVING->MEMBER transition
      Improve rgmanager's exclusive prioritization handling
      rgmanager: Pause during exit if we stopped services
      rgmanager: Fix reference count handling

Masatake YAMATO (1):
      cman_tool: fix typo in man page

Shane Bradley (1):
      cman: Clarify 'expected' option

Vladislav Bogdanov (1):
      cman: do not add mcast address configuration to objdb when udpu is in use

 cman/daemon/cman-preconfig.c                    |   31 +-
 cman/daemon/commands.c                          |    7 +-
 cman/init.d/cman.in                             |   29 +-
 cman/init.d/cman.init.defaults.in               |   10 +-
 cman/man/cman_tool.8                            |    8 +-
 cman/qdisk/score.c                              |    3 +-
 config/tools/xml/cluster.rng.in                 |   47 ++-
 group/dlm_controld/plock.c                      |   32 ++
 rgmanager/include/event.h                       |    1 +
 rgmanager/include/groups.h                      |    2 +-
 rgmanager/src/Makefile                          |    2 +-
 rgmanager/src/daemons/groups.c                  |   12 +-
 rgmanager/src/daemons/main.c                    |   15 +-
 rgmanager/src/daemons/restree.c                 |   12 +-
 rgmanager/src/daemons/rg_event.c                |    7 +
 rgmanager/src/resources/Makefile                |   12 +
 rgmanager/src/resources/default_event_script.sl |  677 +++++++++++++++++++++++
 rgmanager/src/resources/follow-service.sl       |  151 +++++
 18 files changed, 1035 insertions(+), 23 deletions(-)