Mikhail Kurnosov 8cf8553abd Resolve merge conflicts ...

Signed-off-by: Mikhail Kurnosov <mkurnosov@gmail.com>

2018-05-03 07:28:32 +07:00

..

bml

mca: Dynamic components link against project lib

2017-08-24 11:56:16 -04:00

coll

Resolve merge conflicts

2018-05-03 07:28:32 +07:00

common

Updated aggregate_profile.pl

2018-04-26 20:34:24 +05:30

crcp

mca: Dynamic components link against project lib

2017-08-24 11:56:16 -04:00

fbtl

fbtl/posix: fix CID 1419954

2018-03-26 14:21:21 -07:00

fcoll

fcoll/dynamic_gen2: Reduce number of realloc calls

2018-04-20 10:13:57 -05:00

fs

ompio/fs: add summary of supported file systems

2018-04-25 14:39:18 -05:00

hook

ompi/hook: Add the hook/license framework

2017-02-27 12:05:53 -05:00

io

io/romio314: fix two more MPI-3 compliance issues

2018-05-01 15:18:18 -06:00

mtl

mtl: reset ompi_mtl_base_selected_component on framework close

2018-05-02 14:53:34 -06:00

op

mca: Dynamic components link against project lib

2017-08-24 11:56:16 -04:00

osc

Merge pull request #5094 from xinzhao3/topic/osc-win-fix-master

2018-05-02 17:42:34 -04:00

pml

ucx: improve error messages during connection establishment

2018-04-30 15:45:05 +03:00

rte

Add a new OMPI rte component to support direct-launch using PMIx.

2017-11-28 12:05:01 -08:00

sharedfp

remove addproc sharedfp component

2018-03-21 11:27:01 -05:00

topo

topo/treematch: fix CID 1416327

2018-03-26 14:26:17 -07:00

vprotocol

mca: Dynamic components link against project lib

2017-08-24 11:56:16 -04:00

Makefile.am

Revert "Update to sync with OMPI master and cleanup to build"

2016-11-22 15:03:20 -08:00

mca.h

Revert "Update to sync with OMPI master and cleanup to build"

2016-11-22 15:03:20 -08:00