Merge remote-tracking branch 'origin/v10-minor'

Author: scip-ci

check/configuration_tmpfile_setup_cplex.sh

@@ -120,7 +120,7 @@ echo "set mip limits treememory ${MEMLIMIT}" >> "${TMPFILE}"
 echo "set threads ${THREADS}"                >> "${TMPFILE}"
 echo "set parallel 1"                        >> "${TMPFILE}"
 echo "set lpmethod 4"                        >> "${TMPFILE}"
-echo "set barrier crossover -1"              >> "${TMPFILE}"
+echo "set solutiontype 2"                    >> "${TMPFILE}"
 echo "read ${INSTANCE}"                      >> "${TMPFILE}"
 echo "display problem stats"                 >> "${TMPFILE}"
 echo "${OPTCOMMAND}"                         >> "${TMPFILE}"