svn merge -r22059:22088 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

NEWS

doc/man/man1/sacctmgr.1

doc/man/man1/srun.1

doc/man/man1/sshare.1

doc/man/man1/sstat.1

doc/man/man3/slurm_update_job.3

doc/man/man5/cgroup.conf.5

doc/man/man5/slurm.conf.5

doc/man/man5/slurmdbd.conf.5

src/common/assoc_mgr.c

src/common/node_select.h

src/plugins/priority/multifactor/priority_multifactor.c

src/plugins/proctrack/cgroup/xcgroup.c

src/plugins/select/bluegene/plugin/bg_block_info.c

src/plugins/select/bluegene/plugin/bg_job_place.c

src/plugins/select/bluegene/plugin/bg_job_run.c

src/plugins/select/bluegene/plugin/bluegene.c

src/plugins/select/cons_res/select_cons_res.c

src/plugins/select/linear/select_linear.c

src/slurmctld/job_mgr.c