svn merge -r 12559:12575 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 11 additions, 7 deletionsNEWS
- doc/man/man1/sbatch.1 2 additions, 1 deletiondoc/man/man1/sbatch.1
- doc/man/man1/srun.1 5 additions, 1 deletiondoc/man/man1/srun.1
- src/common/env.c 11 additions, 10 deletionssrc/common/env.c
- src/common/env.h 2 additions, 1 deletionsrc/common/env.h
- src/plugins/sched/wiki2/start_job.c 16 additions, 27 deletionssrc/plugins/sched/wiki2/start_job.c
- src/sbatch/opt.c 6 additions, 3 deletionssrc/sbatch/opt.c
- src/sbatch/opt.h 1 addition, 1 deletionsrc/sbatch/opt.h
- src/sbatch/sbatch.c 3 additions, 2 deletionssrc/sbatch/sbatch.c
- src/slurmd/slurmstepd/multi_prog.c 9 additions, 7 deletionssrc/slurmd/slurmstepd/multi_prog.c
- src/slurmd/slurmstepd/task.c 5 additions, 1 deletionsrc/slurmd/slurmstepd/task.c
- src/srun/multi_prog.c 155 additions, 5 deletionssrc/srun/multi_prog.c
- src/srun/multi_prog.h 8 additions, 0 deletionssrc/srun/multi_prog.h
- src/srun/opt.c 6 additions, 4 deletionssrc/srun/opt.c
- src/srun/opt.h 0 additions, 1 deletionsrc/srun/opt.h
- testsuite/expect/test1.54 33 additions, 0 deletionstestsuite/expect/test1.54
- testsuite/expect/test6.7 2 additions, 1 deletiontestsuite/expect/test6.7
Loading
Please register or sign in to comment