"README.rst" did not exist on "a6ad742154c5bee9e057caa83984770c503c5224"
Merge branch 'slurm-2.5'
Conflicts: src/slurmctld/reservation.c
No related branches found
No related tags found
Showing
- NEWS 4 additions, 0 deletionsNEWS
- doc/html/accounting.shtml 11 additions, 7 deletionsdoc/html/accounting.shtml
- doc/man/man1/sacctmgr.1 41 additions, 39 deletionsdoc/man/man1/sacctmgr.1
- src/plugins/select/bluegene/ba_bgq/block_allocator.c 4 additions, 5 deletionssrc/plugins/select/bluegene/ba_bgq/block_allocator.c
- src/plugins/select/bluegene/bg_job_info.c 1 addition, 1 deletionsrc/plugins/select/bluegene/bg_job_info.c
- src/plugins/select/cray/libalps/do_query.c 2 additions, 0 deletionssrc/plugins/select/cray/libalps/do_query.c
- src/sdiag/sdiag.c 1 addition, 2 deletionssrc/sdiag/sdiag.c
- src/slurmctld/reservation.c 95 additions, 13 deletionssrc/slurmctld/reservation.c
Loading
Please register or sign in to comment