Merge branch 'master' of https://github.com/SchedMD/slurm
Conflicts: src/plugins/select/cons_res/select_cons_res.c src/slurmctld/reservation.c
Please register or sign in to comment
Conflicts: src/plugins/select/cons_res/select_cons_res.c src/slurmctld/reservation.c