Merge remote-tracking branch 'origin/slurm-15.08'
# Conflicts: # src/slurmctld/reservation.c
No related branches found
No related tags found
Showing
- NEWS 5 additions, 0 deletionsNEWS
- doc/man/man1/scontrol.1 1 addition, 1 deletiondoc/man/man1/scontrol.1
- src/plugins/task/cgroup/task_cgroup_cpuset.c 30 additions, 48 deletionssrc/plugins/task/cgroup/task_cgroup_cpuset.c
- testsuite/expect/test8.22.prog.c 1 addition, 0 deletionstestsuite/expect/test8.22.prog.c
Loading
Please register or sign in to comment