svn merge -r15604:15620 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 2 additions, 0 deletionsNEWS
- doc/man/man1/sacctmgr.1 2 additions, 1 deletiondoc/man/man1/sacctmgr.1
- doc/man/man1/scancel.1 5 additions, 1 deletiondoc/man/man1/scancel.1
- doc/man/man1/scontrol.1 2 additions, 5 deletionsdoc/man/man1/scontrol.1
- src/common/env.c 21 additions, 6 deletionssrc/common/env.c
- src/common/env.h 1 addition, 1 deletionsrc/common/env.h
- src/common/read_config.c 5 additions, 3 deletionssrc/common/read_config.c
- src/common/slurm_resource_info.c 0 additions, 1 deletionsrc/common/slurm_resource_info.c
- src/common/slurm_step_layout.c 11 additions, 3 deletionssrc/common/slurm_step_layout.c
- src/common/slurm_step_layout.h 2 additions, 0 deletionssrc/common/slurm_step_layout.h
- src/plugins/select/bluegene/block_allocator/bridge_linker.c 19 additions, 0 deletionssrc/plugins/select/bluegene/block_allocator/bridge_linker.c
- src/plugins/select/bluegene/plugin/bg_block_info.c 11 additions, 5 deletionssrc/plugins/select/bluegene/plugin/bg_block_info.c
- src/plugins/select/bluegene/plugin/bg_job_place.c 4 additions, 4 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bg_job_run.c 16 additions, 19 deletionssrc/plugins/select/bluegene/plugin/bg_job_run.c
- src/plugins/select/bluegene/plugin/bg_record_functions.c 13 additions, 13 deletionssrc/plugins/select/bluegene/plugin/bg_record_functions.c
- src/plugins/select/bluegene/plugin/block_sys.c 17 additions, 20 deletionssrc/plugins/select/bluegene/plugin/block_sys.c
- src/plugins/select/bluegene/plugin/bluegene.c 72 additions, 5 deletionssrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/bluegene.h 7 additions, 0 deletionssrc/plugins/select/bluegene/plugin/bluegene.h
- src/plugins/select/bluegene/plugin/defined_block.c 8 additions, 8 deletionssrc/plugins/select/bluegene/plugin/defined_block.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 20 additions, 7 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
Loading
Please register or sign in to comment