• Danny Auble's avatar
    Merge remote-tracking branch 'origin/slurm-18.08' · dad6ce38
    Danny Auble authored
    # Conflicts:
    #	src/plugins/launch/aprun/Makefile.in
    #	src/plugins/proctrack/sgi_job/Makefile.in
    #	src/plugins/select/alps/Makefile.in
    #	src/plugins/select/alps/libalps/Makefile.in
    #	src/plugins/select/alps/libemulate/Makefile.in
    #	src/plugins/select/cons_tres/Makefile.in
    #	src/sprio/Makefile.in
    dad6ce38
To find the state of this project's repository at the time of any of these versions, check out the tags.