75e8b87 Merge branch 'master' into 4.0

Merged and Committed by orion 5 years ago
    Merge branch 'master' into 4.0
    
    - Enable PVFS2/OrangeFS MPI-IO support (bug #1655010)
    - Enable mpi1 compatibility
    
    Conflicts:
    	openmpi.spec
    
        
file modified
+1 -0
file modified
+30 -19