svn merge -r17805:17822 https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
Showing
- NEWS 5 additions, 0 deletionsNEWS
- doc/html/faq.shtml 5 additions, 4 deletionsdoc/html/faq.shtml
- doc/html/priority_multifactor.shtml 6 additions, 1 deletiondoc/html/priority_multifactor.shtml
- src/plugins/sched/backfill/backfill.c 140 additions, 36 deletionssrc/plugins/sched/backfill/backfill.c
- src/plugins/select/bluegene/plugin/bg_job_place.c 10 additions, 1 deletionsrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/scontrol/scontrol.c 3 additions, 2 deletionssrc/scontrol/scontrol.c
- src/slurmctld/node_scheduler.c 76 additions, 17 deletionssrc/slurmctld/node_scheduler.c
- src/slurmctld/slurmctld.h 1 addition, 0 deletionssrc/slurmctld/slurmctld.h
- testsuite/expect/globals 2 additions, 2 deletionstestsuite/expect/globals
Loading
Please register or sign in to comment