svn merge -r11792:11795 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- AUTHORS 1 addition, 0 deletionsAUTHORS
- NEWS 3 additions, 0 deletionsNEWS
- doc/html/team.shtml 2 additions, 1 deletiondoc/html/team.shtml
- src/common/slurm_resource_info.c 4 additions, 4 deletionssrc/common/slurm_resource_info.c
- src/plugins/sched/wiki2/get_jobs.c 8 additions, 6 deletionssrc/plugins/sched/wiki2/get_jobs.c
- src/plugins/sched/wiki2/start_job.c 49 additions, 4 deletionssrc/plugins/sched/wiki2/start_job.c
- src/plugins/select/cons_res/dist_tasks.c 1 addition, 0 deletionssrc/plugins/select/cons_res/dist_tasks.c
- src/plugins/select/cons_res/select_cons_res.c 283 additions, 66 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/salloc/salloc.c 3 additions, 0 deletionssrc/salloc/salloc.c
- src/slurmctld/job_mgr.c 15 additions, 0 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/node_scheduler.c 40 additions, 21 deletionssrc/slurmctld/node_scheduler.c
- src/slurmctld/slurmctld.h 1 addition, 0 deletionssrc/slurmctld/slurmctld.h
Loading
Please register or sign in to comment