svn merge -r20162:20181 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

contribs/lua/proctrack.lua

src/plugins/proctrack/lua/proctrack_lua.c

src/salloc/salloc.c

src/sbatch/sbatch.c

src/slurmctld/job_mgr.c

src/srun/opt.c

src/srun/opt.h

src/srun/srun.c