[Debian-ha-commits] [pacemaker] 41/69: Merge pull request #881 from kgaillot/1.1

[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 a3dc8be89fda7631ab699a00bba846dd0cd4a456
Merge: 32185db 389bf87
Author: Ken Gaillot <kgaillot at redhat.com>
Date:   Thu Jan 7 09:58:12 2016 -0600

    Merge pull request #881 from kgaillot/1.1
    
    Fix: tools: crm_resource compile issue

 tools/crm_resource.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

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