Merge remote-tracking branch 'origin/slurm-14.11'
Showing
- NEWS 5 additions, 0 deletionsNEWS
- doc/html/gres.shtml 2 additions, 1 deletiondoc/html/gres.shtml
- doc/man/man5/gres.conf.5 1 addition, 0 deletionsdoc/man/man5/gres.conf.5
- src/common/gres.c 16 additions, 7 deletionssrc/common/gres.c
- src/slurmctld/reservation.c 2 additions, 1 deletionsrc/slurmctld/reservation.c
Loading
Please register or sign in to comment