svn merge -r15620:15647 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 8 additions, 1 deletionNEWS
- doc/man/man1/srun.1 8 additions, 4 deletionsdoc/man/man1/srun.1
- doc/man/man5/bluegene.conf.5 5 additions, 2 deletionsdoc/man/man5/bluegene.conf.5
- src/common/env.c 22 additions, 19 deletionssrc/common/env.c
- src/common/parse_config.c 4 additions, 5 deletionssrc/common/parse_config.c
- src/common/plugstack.c 0 additions, 2 deletionssrc/common/plugstack.c
- src/common/slurmdbd_defs.c 4 additions, 0 deletionssrc/common/slurmdbd_defs.c
- src/database/mysql_common.c 37 additions, 26 deletionssrc/database/mysql_common.c
- src/plugins/accounting_storage/mysql/accounting_storage_mysql.c 8 additions, 2 deletions...ugins/accounting_storage/mysql/accounting_storage_mysql.c
- src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c 2 additions, 0 deletions...accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
- src/plugins/sched/backfill/backfill.c 2 additions, 5 deletionssrc/plugins/sched/backfill/backfill.c
- src/plugins/select/bluegene/block_allocator/block_allocator.c 27 additions, 5 deletions...plugins/select/bluegene/block_allocator/block_allocator.c
- src/plugins/select/bluegene/block_allocator/block_allocator.h 31 additions, 9 deletions...plugins/select/bluegene/block_allocator/block_allocator.h
- src/plugins/select/bluegene/block_allocator/bridge_linker.c 7 additions, 9 deletionssrc/plugins/select/bluegene/block_allocator/bridge_linker.c
- src/plugins/select/bluegene/plugin/bg_record_functions.c 117 additions, 15 deletionssrc/plugins/select/bluegene/plugin/bg_record_functions.c
- src/plugins/select/bluegene/plugin/bg_switch_connections.c 1 addition, 1 deletionsrc/plugins/select/bluegene/plugin/bg_switch_connections.c
- src/plugins/select/bluegene/plugin/bluegene.c 11 additions, 9 deletionssrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/defined_block.c 3 additions, 8 deletionssrc/plugins/select/bluegene/plugin/defined_block.c
- src/plugins/select/bluegene/plugin/dynamic_block.c 8 additions, 7 deletionssrc/plugins/select/bluegene/plugin/dynamic_block.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 2 additions, 2 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
Loading
Please register or sign in to comment