svn merge -r22804:22822 https://eris.llnl.gov/svn/slurm/branches/slurm-2.2

NEWS

src/plugins/jobcomp/filetxt/jobcomp_filetxt.c

src/plugins/jobcomp/mysql/jobcomp_mysql.c

src/plugins/jobcomp/pgsql/jobcomp_pgsql.c

src/plugins/jobcomp/script/jobcomp_script.c

src/slurmctld/slurmctld.h

src/slurmctld/step_mgr.c