svn merge -r17789:17805 https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
Showing
- NEWS 1 addition, 0 deletionsNEWS
- src/common/read_config.c 67 additions, 75 deletionssrc/common/read_config.c
- src/common/read_config.h 2 additions, 0 deletionssrc/common/read_config.h
- src/plugins/accounting_storage/mysql/accounting_storage_mysql.c 1 addition, 1 deletion...ugins/accounting_storage/mysql/accounting_storage_mysql.c
- src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c 1 addition, 1 deletion...ugins/accounting_storage/pgsql/accounting_storage_pgsql.c
- src/plugins/jobcomp/mysql/jobcomp_mysql.c 1 addition, 1 deletionsrc/plugins/jobcomp/mysql/jobcomp_mysql.c
- src/plugins/jobcomp/pgsql/jobcomp_pgsql.c 1 addition, 1 deletionsrc/plugins/jobcomp/pgsql/jobcomp_pgsql.c
- src/plugins/select/cons_res/select_cons_res.c 108 additions, 26 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/sacctmgr/config_functions.c 4 additions, 0 deletionssrc/sacctmgr/config_functions.c
- src/slurmctld/node_mgr.c 1 addition, 1 deletionsrc/slurmctld/node_mgr.c
- src/slurmd/slurmstepd/io.c 34 additions, 16 deletionssrc/slurmd/slurmstepd/io.c
- src/slurmd/slurmstepd/io.h 1 addition, 0 deletionssrc/slurmd/slurmstepd/io.h
- src/slurmd/slurmstepd/mgr.c 5 additions, 4 deletionssrc/slurmd/slurmstepd/mgr.c
- src/slurmdbd/read_config.c 13 additions, 3 deletionssrc/slurmdbd/read_config.c
- testsuite/expect/test1.84 2 additions, 0 deletionstestsuite/expect/test1.84
Loading
Please register or sign in to comment