[Debian-ha-commits] [pacemaker] 66/69: Merge tag 'upstream/1.1.14' into debian/master

[Christoph Berg]

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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit b4ddc030acfc11485ed4fde8eabf749f8b88a9d9
Merge: ac34441 4f0ffed
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Sun Jan 17 21:49:28 2016 +0100

    Merge tag 'upstream/1.1.14' into debian/master
    
    Upstream version 1.1.14

 ChangeLog          | 49 +++++++++----------------------------------------
 cib/callbacks.c    |  6 ++++--
 configure.ac       |  4 ++--
 crmd/fsa_defines.h |  2 +-
 crmd/te_utils.c    |  2 +-
 fencing/commands.c |  2 +-
 6 files changed, 18 insertions(+), 47 deletions(-)

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