[Debian-ha-commits] [sbd] 08/16: Merge tag 'upstream/1.3.0-13-gf37a182'

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository sbd.

commit 47843c1c90cb9990eccc2294151bcb1a371f5177
Merge: a18e6a3 d4a140f
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Jun 23 15:42:35 2017 +0200

    Merge tag 'upstream/1.3.0-13-gf37a182'
    
    Upstream version 1.3.0-13-gf37a182

 Makefile.am          |  7 +++++--
 configure.ac         |  2 +-
 man/sbd.8.pod        | 45 +++++++++++++++++++++++++--------------------
 sbd.spec             | 11 ++++++++---
 src/Makefile.am      |  2 +-
 src/sbd-cluster.c    |  2 +-
 src/sbd-common.c     |  8 +++++---
 src/sbd-inquisitor.c | 23 ++++++++++++++++++-----
 src/sbd-md.c         |  8 ++++----
 src/sbd.h            |  5 +++--
 src/sbd.sh           |  8 ++++----
 src/sbd.sysconfig    |  9 +++++----
 12 files changed, 80 insertions(+), 50 deletions(-)

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