svn merge -r17765:17779 https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
Showing
- NEWS 9 additions, 0 deletionsNEWS
- doc/man/man1/salloc.1 3 additions, 0 deletionsdoc/man/man1/salloc.1
- doc/man/man1/srun.1 3 additions, 3 deletionsdoc/man/man1/srun.1
- src/plugins/select/cons_res/job_test.c 4 additions, 1 deletionsrc/plugins/select/cons_res/job_test.c
- src/plugins/select/cons_res/select_cons_res.c 14 additions, 0 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/plugins/select/linear/select_linear.c 30 additions, 6 deletionssrc/plugins/select/linear/select_linear.c
- src/salloc/opt.c 5 additions, 0 deletionssrc/salloc/opt.c
- src/slurmctld/job_mgr.c 10 additions, 5 deletionssrc/slurmctld/job_mgr.c
- src/srun/opt.c 1 addition, 0 deletionssrc/srun/opt.c
Loading
Please register or sign in to comment