Merge branch 'aprun'
Conflicts: NEWS configure doc/html/cray.shtml
Showing
- Makefile.in 32 additions, 11 deletionsMakefile.in
- NEWS 4 additions, 0 deletionsNEWS
- aclocal.m4 5 additions, 6 deletionsaclocal.m4
- auxdir/Makefile.in 23 additions, 2 deletionsauxdir/Makefile.in
- auxdir/config.sub 10 additions, 1 deletionauxdir/config.sub
- auxdir/depcomp 72 additions, 52 deletionsauxdir/depcomp
- auxdir/ltmain.sh 2 additions, 2 deletionsauxdir/ltmain.sh
- auxdir/x_ac_srun.m4 0 additions, 32 deletionsauxdir/x_ac_srun.m4
- config.h.in 5 additions, 0 deletionsconfig.h.in
- configure 155 additions, 188 deletionsconfigure
- configure.ac 1 addition, 5 deletionsconfigure.ac
- contribs/Makefile.in 27 additions, 9 deletionscontribs/Makefile.in
- contribs/arrayrun/Makefile.in 23 additions, 2 deletionscontribs/arrayrun/Makefile.in
- contribs/cray/Makefile.am 0 additions, 4 deletionscontribs/cray/Makefile.am
- contribs/cray/Makefile.in 33 additions, 47 deletionscontribs/cray/Makefile.in
- contribs/cray/srun.pl 0 additions, 1109 deletionscontribs/cray/srun.pl
- contribs/lua/Makefile.in 23 additions, 2 deletionscontribs/lua/Makefile.in
- contribs/pam/Makefile.in 25 additions, 3 deletionscontribs/pam/Makefile.in
- contribs/perlapi/Makefile.in 27 additions, 9 deletionscontribs/perlapi/Makefile.in
- contribs/perlapi/libslurm/Makefile.in 23 additions, 2 deletionscontribs/perlapi/libslurm/Makefile.in
Loading
Please register or sign in to comment