svn merge -r12539:12545 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 5 additions, 0 deletionsNEWS
- doc/html/bluegene.shtml 4 additions, 4 deletionsdoc/html/bluegene.shtml
- doc/man/man5/bluegene.conf.5 4 additions, 4 deletionsdoc/man/man5/bluegene.conf.5
- etc/bluegene.conf.example 4 additions, 4 deletionsetc/bluegene.conf.example
- src/plugins/select/bluegene/block_allocator/block_allocator.c 2 additions, 2 deletions...plugins/select/bluegene/block_allocator/block_allocator.c
- src/srun/srun.c 3 additions, 3 deletionssrc/srun/srun.c
- testsuite/expect/README 2 additions, 2 deletionstestsuite/expect/README
- testsuite/expect/test1.21 41 additions, 4 deletionstestsuite/expect/test1.21
- testsuite/expect/test1.89 3 additions, 0 deletionstestsuite/expect/test1.89
Loading
Please register or sign in to comment