svn merge -r18327:18391 https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
Showing
- NEWS 4 additions, 0 deletionsNEWS
- doc/man/man1/scontrol.1 8 additions, 2 deletionsdoc/man/man1/scontrol.1
- doc/man/man5/slurm.conf.5 5 additions, 1 deletiondoc/man/man5/slurm.conf.5
- src/plugins/select/bluegene/plugin/bg_job_place.c 8 additions, 2 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/cons_res/select_cons_res.c 7 additions, 0 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/slurmctld/job_mgr.c 8 additions, 5 deletionssrc/slurmctld/job_mgr.c
- src/srun/opt.c 0 additions, 1 deletionsrc/srun/opt.c
- testsuite/slurm_unit/slurmctld/security_2_1.bash 1 addition, 1 deletiontestsuite/slurm_unit/slurmctld/security_2_1.bash
Loading
Please register or sign in to comment