svn merge -r 22487:22512 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2
No related branches found
No related tags found
Showing
- NEWS 8 additions, 0 deletionsNEWS
- doc/man/man1/salloc.1 39 additions, 11 deletionsdoc/man/man1/salloc.1
- doc/man/man1/sbatch.1 39 additions, 11 deletionsdoc/man/man1/sbatch.1
- doc/man/man1/srun.1 31 additions, 5 deletionsdoc/man/man1/srun.1
- doc/man/man5/slurm.conf.5 0 additions, 2 deletionsdoc/man/man5/slurm.conf.5
- src/api/job_info.c 10 additions, 7 deletionssrc/api/job_info.c
- src/common/env.c 4 additions, 1 deletionsrc/common/env.c
- src/plugins/sched/backfill/backfill.c 4 additions, 0 deletionssrc/plugins/sched/backfill/backfill.c
- src/plugins/select/cons_res/select_cons_res.c 29 additions, 1 deletionsrc/plugins/select/cons_res/select_cons_res.c
- src/salloc/salloc.c 6 additions, 4 deletionssrc/salloc/salloc.c
- src/slurmctld/job_scheduler.c 15 additions, 2 deletionssrc/slurmctld/job_scheduler.c
- src/slurmd/slurmd/req.c 12 additions, 8 deletionssrc/slurmd/slurmd/req.c
- src/slurmd/slurmd/slurmd.c 2 additions, 1 deletionsrc/slurmd/slurmd/slurmd.c
- testsuite/expect/test1.84 7 additions, 6 deletionstestsuite/expect/test1.84
Loading
Please register or sign in to comment