svn merge -r12193:12197 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 4 additions, 0 deletionsNEWS
- doc/man/man1/salloc.1 11 additions, 1 deletiondoc/man/man1/salloc.1
- doc/man/man1/sbatch.1 1 addition, 0 deletionsdoc/man/man1/sbatch.1
- src/plugins/sched/wiki2/start_job.c 0 additions, 1 deletionsrc/plugins/sched/wiki2/start_job.c
- src/salloc/opt.c 14 additions, 2 deletionssrc/salloc/opt.c
- src/salloc/opt.h 1 addition, 0 deletionssrc/salloc/opt.h
- src/salloc/salloc.c 9 additions, 1 deletionsrc/salloc/salloc.c
- testsuite/expect/Makefile.am 1 addition, 0 deletionstestsuite/expect/Makefile.am
- testsuite/expect/Makefile.in 1 addition, 0 deletionstestsuite/expect/Makefile.in
- testsuite/expect/README 1 addition, 0 deletionstestsuite/expect/README
- testsuite/expect/test17.32 1 addition, 6 deletionstestsuite/expect/test17.32
Loading
Please register or sign in to comment