svn merge -r14416:14419 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 1 addition, 0 deletionsNEWS
- doc/man/man1/salloc.1 19 additions, 0 deletionsdoc/man/man1/salloc.1
- doc/man/man1/sbatch.1 3 additions, 0 deletionsdoc/man/man1/sbatch.1
- src/salloc/opt.c 19 additions, 0 deletionssrc/salloc/opt.c
- src/salloc/opt.h 1 addition, 0 deletionssrc/salloc/opt.h
- src/salloc/salloc.c 3 additions, 0 deletionssrc/salloc/salloc.c
- src/sbatch/opt.c 1 addition, 0 deletionssrc/sbatch/opt.c
- src/sbatch/sbatch.c 1 addition, 0 deletionssrc/sbatch/sbatch.c
- src/srun/opt.c 2 additions, 3 deletionssrc/srun/opt.c
Loading
Please register or sign in to comment