[Debian-ha-commits] [cluster-glue] 46/73: Merge tag 'upstream/1.0.12'

[Richard Winters]

This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit f0bbd1248ae1c3f668436e6b5f84423800495866
Merge: 8bd8b5b c13612d
Author: Richard B Winters <rik at mmogp.com>
Date:   Sun Apr 19 21:09:39 2015 -0400

    Merge tag 'upstream/1.0.12'
    
    Upstream version 1.0.12

 .hg_archival.txt                      |   2 +-
 .hgsigs                               |   1 +
 .hgtags                               |   1 +
 ChangeLog                             |  14 ++++
 Makefile.am                           |   3 +
 cluster-glue-fedora.spec              |  26 ++++++-
 cluster-glue-suse.spec                |  39 +++++++++-
 configure.ac                          |  28 ++++++-
 doc/hb_report.8.txt                   |  11 ++-
 hb_report/Makefile.am                 |   1 -
 hb_report/combine-logs.pl             | 136 ----------------------------------
 hb_report/ha_cf_support.sh            |   2 +-
 hb_report/hb_report.in                | 119 ++++++++++++++++-------------
 hb_report/openais_conf_support.sh     |   2 +-
 hb_report/utillib.sh                  |  74 +++++++++++++-----
 lib/clplumbing/cl_log.c               |   4 +-
 lib/clplumbing/ipcsocket.c            |  11 ++-
 lib/clplumbing/ocf_ipc.c              |   6 +-
 lib/plugins/stonith/external/vcenter  |  10 +++
 lib/plugins/stonith/ipmilan_command.c |   1 +
 logd/Makefile.am                      |   6 +-
 logd/ha_logd.c                        |  12 ++-
 logd/logd.service.in                  |  13 ++++
 23 files changed, 295 insertions(+), 227 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git