svn merge -r15824:15836 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 1 addition, 0 deletionsNEWS
- slurm/slurm.h.in 1 addition, 0 deletionsslurm/slurm.h.in
- src/api/job_info.c 22 additions, 1 deletionsrc/api/job_info.c
- src/common/assoc_mgr.c 364 additions, 26 deletionssrc/common/assoc_mgr.c
- src/common/assoc_mgr.h 24 additions, 0 deletionssrc/common/assoc_mgr.h
- src/common/jobacct_common.c 2 additions, 0 deletionssrc/common/jobacct_common.c
- src/common/jobacct_common.h 1 addition, 0 deletionssrc/common/jobacct_common.h
- src/common/read_config.c 7 additions, 1 deletionsrc/common/read_config.c
- src/common/slurm_accounting_storage.c 61 additions, 53 deletionssrc/common/slurm_accounting_storage.c
- src/common/slurm_accounting_storage.h 18 additions, 14 deletionssrc/common/slurm_accounting_storage.h
- src/common/slurm_protocol_api.c 18 additions, 0 deletionssrc/common/slurm_protocol_api.c
- src/common/slurm_protocol_api.h 5 additions, 0 deletionssrc/common/slurm_protocol_api.h
- src/common/slurmdbd_defs.c 70 additions, 38 deletionssrc/common/slurmdbd_defs.c
- src/common/slurmdbd_defs.h 7 additions, 5 deletionssrc/common/slurmdbd_defs.h
- src/database/mysql_common.c 5 additions, 2 deletionssrc/database/mysql_common.c
- src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c 7 additions, 7 deletions...s/accounting_storage/filetxt/accounting_storage_filetxt.c
- src/plugins/accounting_storage/mysql/accounting_storage_mysql.c 673 additions, 183 deletions...ugins/accounting_storage/mysql/accounting_storage_mysql.c
- src/plugins/accounting_storage/mysql/mysql_jobacct_process.c 4 additions, 1 deletionsrc/plugins/accounting_storage/mysql/mysql_jobacct_process.c
- src/plugins/accounting_storage/mysql/mysql_rollup.c 40 additions, 50 deletionssrc/plugins/accounting_storage/mysql/mysql_rollup.c
- src/plugins/accounting_storage/none/accounting_storage_none.c 7 additions, 7 deletions...plugins/accounting_storage/none/accounting_storage_none.c
Loading
Please register or sign in to comment