Mikhail Kurnosov 9557fa087f Resolve merge conflicts ...

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

2018-10-05 21:40:27 +07:00

..

bml

pmix: added check for pmix fence status

2018-08-06 15:01:57 +06:00

coll

Resolve merge conflicts

2018-10-05 21:40:27 +07:00

common

common/monitoring: fix include files

2018-09-15 06:04:13 -07:00

crcp

pmix: added check for pmix fence status

2018-08-06 15:01:57 +06:00

fbtl

DDN's Infinite Memory Engine support for OMPIO

2018-08-16 11:45:47 +02:00

fcoll

fcoll: make vulcan the default component

2018-06-22 14:12:02 -05:00

fs

DDN's Infinite Memory Engine support for OMPIO

2018-08-16 11:45:47 +02:00

hook

ompi/hook: plug a misc memory leak

2018-08-30 10:07:18 +09:00

io

Merge pull request #5494 from markalle/apply_romio314_patch_to_master

2018-09-05 10:27:19 +09:00

mtl

mtl ofi: Change from opt-in to opt-out provider selection

2018-09-27 11:02:18 -07:00

op

mca: Dynamic components link against project lib

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

osc

opal: add types for atomic variables

2018-09-14 10:48:55 -06:00

pml

opal: add types for atomic variables

2018-09-14 10:48:55 -06:00

rte

Correct typo in name comparison flags

2018-06-06 12:18:52 -07:00

sharedfp

sharedfp/sm and lockedfile: fix naming bug

2018-08-27 12:40:49 -05:00

topo

Remove few warnings identified by @rhc in #5514.

2018-08-03 16:21:06 -04: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