svn merge -r7220:7266 https://eris.llnl.gov/svn/slurm/branches/slurm-1.0
Showing
- META 2 additions, 2 deletionsMETA
- NEWS 14 additions, 0 deletionsNEWS
- doc/html/bluegene.shtml 6 additions, 6 deletionsdoc/html/bluegene.shtml
- doc/html/selectplugins.shtml 5 additions, 2 deletionsdoc/html/selectplugins.shtml
- doc/man/man1/sacct.1 1 addition, 1 deletiondoc/man/man1/sacct.1
- doc/man/man1/smap.1 4 additions, 4 deletionsdoc/man/man1/smap.1
- slurm.spec 1 addition, 1 deletionslurm.spec
- slurm/slurm.h.in 1 addition, 2 deletionsslurm/slurm.h.in
- src/common/node_select.c 7 additions, 16 deletionssrc/common/node_select.c
- src/common/node_select.h 3 additions, 2 deletionssrc/common/node_select.h
- src/plugins/select/bluegene/plugin/bg_job_place.c 12 additions, 51 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bg_job_place.h 3 additions, 2 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.h
- src/plugins/select/bluegene/plugin/bluegene.c 1 addition, 1 deletionsrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 3 additions, 2 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/plugins/select/cons_res/select_cons_res.c 3 additions, 1 deletionsrc/plugins/select/cons_res/select_cons_res.c
- src/plugins/select/linear/select_linear.c 3 additions, 1 deletionsrc/plugins/select/linear/select_linear.c
- src/plugins/switch/federation/federation.c 8 additions, 2 deletionssrc/plugins/switch/federation/federation.c
- src/sacct/sacct.c 1 addition, 1 deletionsrc/sacct/sacct.c
- src/slurmctld/node_scheduler.c 8 additions, 14 deletionssrc/slurmctld/node_scheduler.c
- src/squeue/print.c 1 addition, 1 deletionsrc/squeue/print.c
Loading
Please register or sign in to comment