[Pkg-ofed-commits] [rds-tools] 02/11: Merge tag 'upstream/2.0.4'

[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 rds-tools.

commit 06cbfbc0e73ee3569c7507e4a6528dbd36a86896
Merge: 3c4e750 a543ed9
Author: Ana Guerrero López <ana at ekaia.org>
Date:   Fri Jul 18 13:47:36 2014 +0200

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4

 Makefile                      |  22 +-
 Makefile.in                   |  16 +-
 configure                     |   2 +-
 configure.in                  |   2 +-
 examples/Makefile             |   2 +-
 examples/rds-sample.c         | 316 +++++++++++++++++----------
 net/ib_rds.h => include/rds.h |  67 +++---
 net/rds.h                     |  50 -----
 options.c                     | 481 ------------------------------------------
 pfhack.c                      |  24 +--
 pfhack.h                      |  12 +-
 rds-gen.1                     |  89 --------
 rds-gen.c                     | 322 ----------------------------
 rds-info.c                    |  68 +++---
 rds-ping.c                    |  19 +-
 rds-rdma.7                    |   2 +-
 rds-sink.1                    |   1 -
 rds-sink.c                    | 250 ----------------------
 rds-stress.c                  | 219 ++++++++++++-------
 rds-tools.spec                |  25 ++-
 rds-tools.spec.in             |  23 +-
 rds-tools.txt                 |  39 ----
 rdstool.h                     | 112 ----------
 stap/README                   |  15 --
 stap/rds.stp                  |  35 ---
 stats.c                       | 227 --------------------
 26 files changed, 508 insertions(+), 1932 deletions(-)

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