svn merge -r 9518:9532 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
Showing
- NEWS 1 addition, 1 deletionNEWS
- src/plugins/sched/wiki2/job_will_run.c 17 additions, 9 deletionssrc/plugins/sched/wiki2/job_will_run.c
- src/plugins/sched/wiki2/resume_job.c 6 additions, 0 deletionssrc/plugins/sched/wiki2/resume_job.c
- src/plugins/sched/wiki2/suspend_job.c 6 additions, 0 deletionssrc/plugins/sched/wiki2/suspend_job.c
- src/slurmctld/job_mgr.c 1 addition, 1 deletionsrc/slurmctld/job_mgr.c
- src/slurmctld/job_scheduler.c 1 addition, 1 deletionsrc/slurmctld/job_scheduler.c
- src/slurmctld/node_scheduler.c 25 additions, 6 deletionssrc/slurmctld/node_scheduler.c
- src/slurmctld/node_scheduler.h 5 additions, 1 deletionsrc/slurmctld/node_scheduler.h
- testsuite/expect/test7.7 16 additions, 6 deletionstestsuite/expect/test7.7
- testsuite/expect/test7.7.prog.c 3 additions, 1 deletiontestsuite/expect/test7.7.prog.c
Loading
Please register or sign in to comment