Merge remote-tracking branch 'origin/slurm-2.6'
Conflicts: src/common/read_config.c src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c src/plugins/jobcomp/pgsql/jobcomp_pgsql.c src/slurmctld/job_mgr.c
Showing
- NEWS 18 additions, 0 deletionsNEWS
- contribs/slurm_completion_help/README.md 4 additions, 0 deletionscontribs/slurm_completion_help/README.md
- contribs/torque/qsub.pl 2 additions, 2 deletionscontribs/torque/qsub.pl
- doc/html/checkpoint_blcr.shtml 2 additions, 2 deletionsdoc/html/checkpoint_blcr.shtml
- doc/html/cons_res.shtml 109 additions, 215 deletionsdoc/html/cons_res.shtml
- doc/html/reservations.shtml 30 additions, 34 deletionsdoc/html/reservations.shtml
- doc/html/resource_limits.shtml 3 additions, 9 deletionsdoc/html/resource_limits.shtml
- doc/html/team.shtml 2 additions, 1 deletiondoc/html/team.shtml
- doc/html/topology.shtml 15 additions, 5 deletionsdoc/html/topology.shtml
- doc/man/man1/sacct.1 2 additions, 3 deletionsdoc/man/man1/sacct.1
- src/common/gres.c 5 additions, 7 deletionssrc/common/gres.c
- src/common/job_resources.h 1 addition, 1 deletionsrc/common/job_resources.h
- src/common/parse_config.c 9 additions, 5 deletionssrc/common/parse_config.c
- src/common/read_config.c 19 additions, 10 deletionssrc/common/read_config.c
- src/common/slurm_acct_gather_energy.c 40 additions, 19 deletionssrc/common/slurm_acct_gather_energy.c
- src/common/slurm_priority.h 4 additions, 1 deletionsrc/common/slurm_priority.h
- src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c 4 additions, 6 deletions...gins/accounting_storage/filetxt/filetxt_jobacct_process.c
- src/plugins/accounting_storage/mysql/as_mysql_rollup.c 11 additions, 8 deletionssrc/plugins/accounting_storage/mysql/as_mysql_rollup.c
- src/plugins/priority/basic/priority_basic.c 1 addition, 1 deletionsrc/plugins/priority/basic/priority_basic.c
- src/plugins/priority/multifactor/priority_multifactor.c 12 additions, 6 deletionssrc/plugins/priority/multifactor/priority_multifactor.c
Loading
Please register or sign in to comment