svn merge -r20162:20181 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1
Showing
- NEWS 3 additions, 0 deletionsNEWS
- contribs/lua/proctrack.lua 49 additions, 32 deletionscontribs/lua/proctrack.lua
- src/plugins/proctrack/lua/proctrack_lua.c 153 additions, 47 deletionssrc/plugins/proctrack/lua/proctrack_lua.c
- src/salloc/salloc.c 15 additions, 0 deletionssrc/salloc/salloc.c
- src/sbatch/sbatch.c 15 additions, 0 deletionssrc/sbatch/sbatch.c
- src/slurmctld/job_mgr.c 0 additions, 5 deletionssrc/slurmctld/job_mgr.c
- src/srun/opt.c 29 additions, 0 deletionssrc/srun/opt.c
- src/srun/opt.h 4 additions, 0 deletionssrc/srun/opt.h
- src/srun/srun.c 1 addition, 0 deletionssrc/srun/srun.c
Loading
Please register or sign in to comment