svn merge -r13326:13373 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- src/api/step_launch.c 1 addition, 0 deletionssrc/api/step_launch.c
- src/plugins/select/cons_res/select_cons_res.c 2 additions, 0 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/slurmctld/job_mgr.c 1 addition, 0 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/proc_req.c 1 addition, 1 deletionsrc/slurmctld/proc_req.c
Loading
Please register or sign in to comment