Merge remote-tracking branch 'origin/slurm-14.11'
Conflicts: doc/man/man1/sacct.1 doc/man/man1/srun.1 src/sacct/sacct.h
No related branches found
No related tags found
Showing
- NEWS 15 additions, 0 deletionsNEWS
- auxdir/x_ac_debug.m4 12 additions, 11 deletionsauxdir/x_ac_debug.m4
- config.h.in 9 additions, 0 deletionsconfig.h.in
- configure 17 additions, 13 deletionsconfigure
- configure.ac 3 additions, 1 deletionconfigure.ac
- contribs/cray/opt_modulefiles_slurm.in 1 addition, 1 deletioncontribs/cray/opt_modulefiles_slurm.in
- doc/html/mc_support.shtml 78 additions, 105 deletionsdoc/html/mc_support.shtml
- doc/html/team.shtml 1 addition, 0 deletionsdoc/html/team.shtml
- doc/html/troubleshoot.shtml 6 additions, 2 deletionsdoc/html/troubleshoot.shtml
- doc/man/man1/sacct.1 25 additions, 19 deletionsdoc/man/man1/sacct.1
- doc/man/man1/salloc.1 11 additions, 2 deletionsdoc/man/man1/salloc.1
- doc/man/man1/sbatch.1 10 additions, 1 deletiondoc/man/man1/sbatch.1
- doc/man/man1/scontrol.1 2 additions, 5 deletionsdoc/man/man1/scontrol.1
- doc/man/man1/sinfo.1 3 additions, 3 deletionsdoc/man/man1/sinfo.1
- doc/man/man1/smap.1 1 addition, 1 deletiondoc/man/man1/smap.1
- doc/man/man1/squeue.1 1 addition, 1 deletiondoc/man/man1/squeue.1
- doc/man/man1/srun.1 15 additions, 5 deletionsdoc/man/man1/srun.1
- doc/man/man1/sshare.1 5 additions, 0 deletionsdoc/man/man1/sshare.1
- doc/man/man1/strigger.1 1 addition, 1 deletiondoc/man/man1/strigger.1
- doc/man/man3/slurm_allocate_resources.3 1 addition, 1 deletiondoc/man/man3/slurm_allocate_resources.3
Loading
Please register or sign in to comment