svn merge -r12667:12698 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 3 additions, 0 deletionsNEWS
- doc/man/man1/sbatch.1 18 additions, 8 deletionsdoc/man/man1/sbatch.1
- src/common/env.c 10 additions, 3 deletionssrc/common/env.c
- src/common/env.h 8 additions, 3 deletionssrc/common/env.h
- src/plugins/sched/wiki/get_jobs.c 57 additions, 11 deletionssrc/plugins/sched/wiki/get_jobs.c
- src/plugins/sched/wiki2/hostlist.c 11 additions, 5 deletionssrc/plugins/sched/wiki2/hostlist.c
- src/sbatch/opt.c 25 additions, 3 deletionssrc/sbatch/opt.c
- src/sbatch/opt.h 2 additions, 1 deletionsrc/sbatch/opt.h
- src/sbatch/sbatch.c 3 additions, 2 deletionssrc/sbatch/sbatch.c
- src/slurmctld/step_mgr.c 1 addition, 4 deletionssrc/slurmctld/step_mgr.c
Loading
Please register or sign in to comment