Merge branch 'slurm-15.08'
Conflicts: src/api/partition_info.c
Showing
- NEWS 5 additions, 0 deletionsNEWS
- src/api/partition_info.c 105 additions, 173 deletionssrc/api/partition_info.c
- src/api/reservation_info.c 21 additions, 35 deletionssrc/api/reservation_info.c
- src/common/hostlist.h 0 additions, 3 deletionssrc/common/hostlist.h
- src/slurmctld/reservation.c 9 additions, 4 deletionssrc/slurmctld/reservation.c
Loading
Please register or sign in to comment