svn merge -r20386:20416 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1
Showing
- NEWS 8 additions, 0 deletionsNEWS
- doc/man/man1/sacct.1 20 additions, 18 deletionsdoc/man/man1/sacct.1
- doc/man/man1/salloc.1 1 addition, 2 deletionsdoc/man/man1/salloc.1
- doc/man/man1/sbatch.1 1 addition, 2 deletionsdoc/man/man1/sbatch.1
- doc/man/man1/srun.1 1 addition, 2 deletionsdoc/man/man1/srun.1
- src/common/job_resources.c 1 addition, 1 deletionsrc/common/job_resources.c
- src/common/node_select.h 1 addition, 2 deletionssrc/common/node_select.h
- src/plugins/select/bluegene/plugin/bg_job_place.c 23 additions, 20 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bluegene.c 0 additions, 1 deletionsrc/plugins/select/bluegene/plugin/bluegene.c
- src/sacctmgr/sacctmgr.c 6 additions, 6 deletionssrc/sacctmgr/sacctmgr.c
- src/slurmctld/job_scheduler.c 2 additions, 2 deletionssrc/slurmctld/job_scheduler.c
- src/slurmctld/node_mgr.c 4 additions, 18 deletionssrc/slurmctld/node_mgr.c
- src/slurmd/slurmd/req.c 25 additions, 0 deletionssrc/slurmd/slurmd/req.c
- src/srun/allocate.c 1 addition, 0 deletionssrc/srun/allocate.c
- testsuite/expect/globals 31 additions, 0 deletionstestsuite/expect/globals
- testsuite/expect/test21.21 235 additions, 1 deletiontestsuite/expect/test21.21
- testsuite/expect/test21.28 104 additions, 3 deletionstestsuite/expect/test21.28
Loading
Please register or sign in to comment