Merge branch 'master' of https://github.com/SchedMD/slurm
Conflicts: src/api/reservation_info.c src/common/node_select.c src/common/node_select.h src/plugins/sched/backfill/backfill.c src/plugins/sched/builtin/builtin.c src/plugins/sched/wiki2/job_will_run.c src/plugins/select/bluegene/select_bluegene.c src/plugins/select/cons_res/dist_tasks.c src/plugins/select/cons_res/job_test.c src/plugins/select/cons_res/select_cons_res.c src/plugins/select/cray/other_select.c src/plugins/select/cray/other_select.h src/plugins/select/cray/select_cray.c src/plugins/select/linear/select_linear.c src/scontrol/create_res.c src/slurmctld/job_scheduler.c src/slurmctld/node_scheduler.c src/slurmctld/reservation.c src/slurmctld/reservation.h src/slurmctld/slurmctld.h
Some changes are not shown.
For a faster browsing experience, only 20 of 319+ files are shown. Download one of the files below to see all changes.
Please register or sign in to comment