Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Compiler/hdf5_serial/1/variants.Linux
#	Compiler/openmpi/3/variants.Linux
This commit is contained in:
2018-10-11 11:24:27 +02:00
4 changed files with 9 additions and 1 deletions

View File

@@ -71,3 +71,4 @@ hdf5_serial/1.10.2 stable gcc/6.4.0
hdf5_serial/1.10.2 stable gcc/7.3.0
hdf5_serial/1.10.2 stable intel/18.2
hdf5_serial/1.10.2 unstable pgi/18.5
hdf5_serial/1.10.2 stable intel/18.3

View File

@@ -11,5 +11,6 @@ openmpi/3.0.1 stable gcc/8.1.0
openpmi/3.0.1 unstable intel/18.2
openmpi/3.1.1 stable gcc/8.1.0
openmpi/3.1.1 stable gcc/8.2.0
openmpi/3.1.2 stable gcc/7.3.0