svn merge -r11234:11242 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
Showing
- NEWS 2 additions, 0 deletionsNEWS
- src/plugins/select/bluegene/block_allocator/block_allocator.c 14 additions, 15 deletions...plugins/select/bluegene/block_allocator/block_allocator.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/bluegene.c 6 additions, 5 deletionssrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 3 additions, 1 deletionsrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/smap/configure_functions.c 1 addition, 1 deletionsrc/smap/configure_functions.c
- src/smap/grid_functions.c 3 additions, 2 deletionssrc/smap/grid_functions.c
Loading
Please register or sign in to comment