svn merge -r13257:13271 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- src/common/hostlist.c 22 additions, 7 deletionssrc/common/hostlist.c
- src/common/node_select.c 24 additions, 12 deletionssrc/common/node_select.c
- src/plugins/select/bluegene/block_allocator/block_allocator.h 1 addition, 1 deletion...plugins/select/bluegene/block_allocator/block_allocator.h
- src/plugins/select/bluegene/plugin/bg_job_place.c 5 additions, 100 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bg_job_run.c 0 additions, 3 deletionssrc/plugins/select/bluegene/plugin/bg_job_run.c
- src/plugins/select/bluegene/plugin/bg_record_functions.c 5 additions, 1 deletionsrc/plugins/select/bluegene/plugin/bg_record_functions.c
- src/plugins/select/bluegene/plugin/bluegene.c 0 additions, 43 deletionssrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/bluegene.h 0 additions, 3 deletionssrc/plugins/select/bluegene/plugin/bluegene.h
- src/plugins/select/bluegene/plugin/dynamic_block.c 4 additions, 2 deletionssrc/plugins/select/bluegene/plugin/dynamic_block.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 0 additions, 2 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/salloc/opt.c 3 additions, 0 deletionssrc/salloc/opt.c
- src/sbatch/opt.c 3 additions, 0 deletionssrc/sbatch/opt.c
- src/smap/configure_functions.c 1 addition, 0 deletionssrc/smap/configure_functions.c
- src/smap/partition_functions.c 2 additions, 0 deletionssrc/smap/partition_functions.c
- src/srun/opt.c 2 additions, 0 deletionssrc/srun/opt.c
Loading
Please register or sign in to comment