svn merge -r20210:20220 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

doc/man/man1/salloc.1

doc/man/man1/sbatch.1

doc/man/man1/srun.1

slurm/slurm.h.in

src/common/plugstack.c

src/common/proc_args.c

src/common/slurm_resource_info.c

src/common/slurm_resource_info.h

src/plugins/select/cons_res/dist_tasks.c

src/plugins/select/cons_res/job_test.c

src/plugins/select/cons_res/select_cons_res.c

src/plugins/select/linear/select_linear.c

src/salloc/opt.c

src/salloc/salloc.c

src/sbatch/opt.c

src/sbatch/sbatch.c

src/slurmctld/job_mgr.c

src/slurmctld/node_scheduler.c

src/srun/opt.c