[Pkg-ofed-commits] [ibacm] 04/11: Merge tag 'upstream/1.2.0'

[Ana Beatriz Guerrero López]

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

ana pushed a commit to branch master
in repository ibacm.

commit d26501ab57a974b85efb4c1fdd37caaa2a057df1
Merge: fe78adf a70f1ea
Author: Ana Beatriz Guerrero Lopez <ana at debian.org>
Date:   Tue Mar 29 16:27:33 2016 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 Makefile.am          |   2 +-
 Makefile.in          |   2 +-
 config.h.in          |   3 +
 configure            |  40 +++--
 configure.ac         |   9 +-
 ibacm.spec           |   2 +-
 ibacm.spec.in        |   2 +-
 prov/acmp/src/acmp.c |  72 +++++++++
 src/acm.c            | 409 +++++++++++++++++++++++++++++++++++++++++++++++++--
 src/acm_netlink.h    | 128 ++++++++++++++++
 10 files changed, 644 insertions(+), 25 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/ibacm.git