svn merge -r12350:12384 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- BUILD.NOTES 4 additions, 4 deletionsBUILD.NOTES
- NEWS 5 additions, 0 deletionsNEWS
- slurm.spec 2 additions, 2 deletionsslurm.spec
- src/common/hostlist.c 19 additions, 10 deletionssrc/common/hostlist.c
- src/plugins/sched/wiki2/hostlist.c 4 additions, 0 deletionssrc/plugins/sched/wiki2/hostlist.c
- src/plugins/select/bluegene/block_allocator/Makefile.am 7 additions, 6 deletionssrc/plugins/select/bluegene/block_allocator/Makefile.am
- src/plugins/select/bluegene/block_allocator/Makefile.in 6 additions, 6 deletionssrc/plugins/select/bluegene/block_allocator/Makefile.in
- src/plugins/select/bluegene/block_allocator/block_allocator.c 294 additions, 273 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/slurmctld/agent.c 2 additions, 1 deletionsrc/slurmctld/agent.c
Loading
Please register or sign in to comment