svn merge -r15285:15315 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 10 additions, 0 deletionsNEWS
- doc/man/man1/sbatch.1 3 additions, 0 deletionsdoc/man/man1/sbatch.1
- doc/man/man1/srun.1 4 additions, 1 deletiondoc/man/man1/srun.1
- doc/man/man5/slurm.conf.5 21 additions, 8 deletionsdoc/man/man5/slurm.conf.5
- src/common/read_config.c 1 addition, 0 deletionssrc/common/read_config.c
- src/common/slurm_protocol_defs.c 3 additions, 0 deletionssrc/common/slurm_protocol_defs.c
- src/plugins/jobcomp/filetxt/jobcomp_filetxt.c 34 additions, 3 deletionssrc/plugins/jobcomp/filetxt/jobcomp_filetxt.c
- src/sbatch/opt.c 2 additions, 0 deletionssrc/sbatch/opt.c
- src/slurmctld/node_mgr.c 5 additions, 4 deletionssrc/slurmctld/node_mgr.c
- src/slurmctld/proc_req.c 5 additions, 4 deletionssrc/slurmctld/proc_req.c
- src/srun/opt.c 2 additions, 0 deletionssrc/srun/opt.c
Loading
Please register or sign in to comment