[Pkg-ofed-commits] [dapl] 04/06: Merge tag 'upstream/2.1.7'

[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 dapl.

commit 14e3eacf10a8052dbec8e5a5e1cffcb8fbc0b5f4
Merge: 5de6706 c8e953b
Author: Ana Beatriz Guerrero Lopez <ana at debian.org>
Date:   Fri Mar 25 18:44:28 2016 +0100

    Merge tag 'upstream/2.1.7'
    
    Upstream version 2.1.7

 ChangeLog                                     | 135 ++++++++++++++
 configure                                     |  20 +-
 configure.in                                  |   4 +-
 dapl.spec                                     |   5 +-
 dapl.spec.in                                  |   3 +
 dapl/openib_common/collectives/fca_provider.c |  18 +-
 dapl/openib_common/dapl_ib_common.h           |   1 +
 dapl/openib_common/dapl_mic_common.h          |   9 +-
 dapl/openib_common/qp.c                       |   1 +
 dapl/openib_mcm/cm.c                          |  16 ++
 dapl/openib_mcm/device.c                      |   4 +-
 dapl/openib_mcm/proxy.c                       |  15 +-
 dapl/openib_ucm/dapl_ib_util.h                |   1 +
 dapl/openib_ucm/device.c                      |   3 +-
 dapl/svc/mcm.c                                |  12 +-
 dapl/svc/mix.c                                |  46 +++--
 dapl/svc/mpxy_in.c                            | 109 +++++++----
 dapl/svc/mpxy_out.c                           |  15 +-
 dapl/svc/mpxyd.c                              |  10 +-
 dapl/svc/mpxyd.h                              |   3 +-
 dapl/svc/util.c                               |   6 +
 dat/common/dat_api.c                          |   3 +
 test/dapltest/cmd/dapl_params.c               |   1 +
 test/dtest/dtest.c                            | 256 +++++++++++++++++++++-----
 24 files changed, 561 insertions(+), 135 deletions(-)

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