Merge branch 'slurm-2.6' of http://github.com/SchedMD/slurm into slurm-2.6
Conflicts: NEWS
Showing
- NEWS 12 additions, 1 deletionNEWS
- doc/man/man5/slurm.conf.5 17 additions, 5 deletionsdoc/man/man5/slurm.conf.5
- src/common/slurm_protocol_util.c 1 addition, 1 deletionsrc/common/slurm_protocol_util.c
- src/common/slurm_resource_info.c 6 additions, 0 deletionssrc/common/slurm_resource_info.c
- src/common/timers.c 2 additions, 2 deletionssrc/common/timers.c
- src/plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c 11 additions, 4 deletions...plugins/acct_gather_energy/ipmi/acct_gather_energy_ipmi.c
- src/plugins/mpi/pmi2/spawn.c 6 additions, 6 deletionssrc/plugins/mpi/pmi2/spawn.c
- src/plugins/sched/backfill/backfill.c 13 additions, 0 deletionssrc/plugins/sched/backfill/backfill.c
- src/plugins/select/cons_res/dist_tasks.c 19 additions, 35 deletionssrc/plugins/select/cons_res/dist_tasks.c
- src/plugins/task/cgroup/task_cgroup_cpuset.c 3 additions, 3 deletionssrc/plugins/task/cgroup/task_cgroup_cpuset.c
- src/slurmctld/job_mgr.c 5 additions, 2 deletionssrc/slurmctld/job_mgr.c
- src/slurmd/slurmd/slurmd.c 5 additions, 5 deletionssrc/slurmd/slurmd/slurmd.c
- testsuite/expect/test1.89 7 additions, 4 deletionstestsuite/expect/test1.89
- testsuite/expect/test1.90 13 additions, 0 deletionstestsuite/expect/test1.90
Loading
Please register or sign in to comment