svn merge -r22838:22929 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

NEWS

doc/man/man1/srun.1

doc/man/man5/slurm.conf.5

src/common/pack.c

src/sacct/options.c

src/sacctmgr/archive_functions.c

src/sacctmgr/event_functions.c

src/sacctmgr/user_functions.c

src/scancel/opt.c

src/slurmctld/job_mgr.c

src/slurmctld/node_mgr.c

src/slurmctld/node_scheduler.c

src/squeue/opts.c

src/sreport/job_reports.c

src/strigger/opts.c