svn merge -r15841:15850 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- src/common/slurm_accounting_storage.c 11 additions, 0 deletionssrc/common/slurm_accounting_storage.c
- src/database/mysql_common.c 156 additions, 9 deletionssrc/database/mysql_common.c
- src/plugins/accounting_storage/mysql/accounting_storage_mysql.c 6 additions, 4 deletions...ugins/accounting_storage/mysql/accounting_storage_mysql.c
- src/plugins/accounting_storage/mysql/mysql_rollup.c 62 additions, 46 deletionssrc/plugins/accounting_storage/mysql/mysql_rollup.c
- src/sacctmgr/account_functions.c 13 additions, 13 deletionssrc/sacctmgr/account_functions.c
- src/sacctmgr/association_functions.c 8 additions, 8 deletionssrc/sacctmgr/association_functions.c
- src/sacctmgr/cluster_functions.c 8 additions, 8 deletionssrc/sacctmgr/cluster_functions.c
- src/sacctmgr/file_functions.c 16 additions, 12 deletionssrc/sacctmgr/file_functions.c
- src/sacctmgr/qos_functions.c 9 additions, 9 deletionssrc/sacctmgr/qos_functions.c
- src/sacctmgr/user_functions.c 18 additions, 16 deletionssrc/sacctmgr/user_functions.c
- src/slurmctld/proc_req.c 5 additions, 0 deletionssrc/slurmctld/proc_req.c
- src/slurmdbd/slurmdbd.c 2 additions, 1 deletionsrc/slurmdbd/slurmdbd.c
- testsuite/expect/test21.15 1 addition, 1 deletiontestsuite/expect/test21.15
- testsuite/expect/test21.16 1 addition, 1 deletiontestsuite/expect/test21.16
- testsuite/expect/test21.17 1 addition, 1 deletiontestsuite/expect/test21.17
- testsuite/expect/test21.18 2 additions, 2 deletionstestsuite/expect/test21.18
Loading
Please register or sign in to comment