Merge branch 'slurm-15.08'
Conflicts: src/plugins/burst_buffer/cray/burst_buffer_cray.c
No related branches found
No related tags found
Showing
- NEWS 25 additions, 0 deletionsNEWS
- doc/man/man1/salloc.1 7 additions, 4 deletionsdoc/man/man1/salloc.1
- doc/man/man1/sbatch.1 7 additions, 4 deletionsdoc/man/man1/sbatch.1
- doc/man/man1/srun.1 10 additions, 12 deletionsdoc/man/man1/srun.1
- doc/man/man5/slurm.conf.5 4 additions, 2 deletionsdoc/man/man5/slurm.conf.5
- src/common/assoc_mgr.c 8 additions, 2 deletionssrc/common/assoc_mgr.c
- src/common/env.c 6 additions, 0 deletionssrc/common/env.c
- src/common/slurm_protocol_defs.c 2 additions, 1 deletionsrc/common/slurm_protocol_defs.c
- src/common/slurmdb_pack.c 0 additions, 2 deletionssrc/common/slurmdb_pack.c
- src/sacctmgr/common.c 6 additions, 0 deletionssrc/sacctmgr/common.c
- src/sacctmgr/sacctmgr.c 17 additions, 21 deletionssrc/sacctmgr/sacctmgr.c
- src/slurmctld/job_mgr.c 87 additions, 48 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/job_scheduler.c 25 additions, 20 deletionssrc/slurmctld/job_scheduler.c
- src/slurmctld/reservation.c 3 additions, 1 deletionsrc/slurmctld/reservation.c
- src/sreport/cluster_reports.c 70 additions, 93 deletionssrc/sreport/cluster_reports.c
- src/sreport/common.c 31 additions, 0 deletionssrc/sreport/common.c
- src/sreport/resv_reports.c 5 additions, 2 deletionssrc/sreport/resv_reports.c
- src/sreport/sreport.h 9 additions, 0 deletionssrc/sreport/sreport.h
- src/sreport/user_reports.c 9 additions, 19 deletionssrc/sreport/user_reports.c
Loading
Please register or sign in to comment