svn merge -r14958:15006 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 10 additions, 0 deletionsNEWS
- configure 1 addition, 1 deletionconfigure
- doc/html/faq.shtml 7 additions, 2 deletionsdoc/html/faq.shtml
- doc/html/team.shtml 3 additions, 1 deletiondoc/html/team.shtml
- doc/man/man5/slurm.conf.5 12 additions, 4 deletionsdoc/man/man5/slurm.conf.5
- etc/init.d.slurmdbd 23 additions, 11 deletionsetc/init.d.slurmdbd
- src/api/allocate.c 1 addition, 1 deletionsrc/api/allocate.c
- src/common/assoc_mgr.c 18 additions, 9 deletionssrc/common/assoc_mgr.c
- src/common/assoc_mgr.h 8 additions, 1 deletionsrc/common/assoc_mgr.h
- src/common/read_config.c 9 additions, 3 deletionssrc/common/read_config.c
- src/plugins/accounting_storage/filetxt/accounting_storage_filetxt.c 8 additions, 2 deletions...s/accounting_storage/filetxt/accounting_storage_filetxt.c
- src/plugins/accounting_storage/mysql/accounting_storage_mysql.c 88 additions, 42 deletions...ugins/accounting_storage/mysql/accounting_storage_mysql.c
- src/plugins/accounting_storage/mysql/mysql_jobacct_process.c 13 additions, 3 deletionssrc/plugins/accounting_storage/mysql/mysql_jobacct_process.c
- src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c 27 additions, 12 deletions...ugins/accounting_storage/pgsql/accounting_storage_pgsql.c
- src/plugins/sched/wiki/job_modify.c 4 additions, 5 deletionssrc/plugins/sched/wiki/job_modify.c
- src/plugins/sched/wiki2/job_modify.c 3 additions, 5 deletionssrc/plugins/sched/wiki2/job_modify.c
- src/plugins/select/bluegene/block_allocator/block_allocator.c 339 additions, 725 deletions...plugins/select/bluegene/block_allocator/block_allocator.c
- src/plugins/select/bluegene/plugin/bg_job_place.c 8 additions, 3 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bluegene.c 0 additions, 1 deletionsrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/slurm_prolog.c 3 additions, 2 deletionssrc/plugins/select/bluegene/plugin/slurm_prolog.c
Loading
Please register or sign in to comment