svn merge -r20973:21007 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1

NEWS

src/common/assoc_mgr.c

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

src/slurmctld/agent.c

src/slurmctld/node_mgr.c