svn merge -r 22512:22544 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

NEWS

doc/man/man1/salloc.1

doc/man/man1/sbatch.1

doc/man/man1/scontrol.1

doc/man/man1/srun.1

doc/man/man5/slurm.conf.5

src/plugins/sched/backfill/backfill.c

src/plugins/select/cons_res/select_cons_res.c

src/plugins/task/affinity/dist_tasks.c

src/slurmctld/job_mgr.c