svn merge -r19335:19360 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1
Showing
- NEWS 5 additions, 0 deletionsNEWS
- doc/man/man1/scontrol.1 24 additions, 0 deletionsdoc/man/man1/scontrol.1
- doc/man/man5/slurm.conf.5 6 additions, 6 deletionsdoc/man/man5/slurm.conf.5
- src/plugins/sched/wiki2/hostlist.c 20 additions, 0 deletionssrc/plugins/sched/wiki2/hostlist.c
- src/plugins/select/cons_res/select_cons_res.c 2 additions, 0 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/scontrol/scontrol.c 18 additions, 13 deletionssrc/scontrol/scontrol.c
- src/slurmctld/controller.c 8 additions, 2 deletionssrc/slurmctld/controller.c
- src/slurmctld/step_mgr.c 15 additions, 3 deletionssrc/slurmctld/step_mgr.c
- src/sview/job_info.c 5 additions, 34 deletionssrc/sview/job_info.c
- src/sview/part_info.c 50 additions, 4 deletionssrc/sview/part_info.c
Loading
Please register or sign in to comment