Merge branch 'slurm-2.6'
Conflicts: src/common/plugstack.c
No related branches found
No related tags found
Showing
- NEWS 5 additions, 0 deletionsNEWS
- slurm.spec 4 additions, 0 deletionsslurm.spec
- src/common/plugstack.c 60 additions, 19 deletionssrc/common/plugstack.c
- src/common/proc_args.c 1 addition, 1 deletionsrc/common/proc_args.c
- src/common/slurm_cred.c 0 additions, 16 deletionssrc/common/slurm_cred.c
- src/common/slurm_cred.h 0 additions, 1 deletionsrc/common/slurm_cred.h
- src/common/slurm_protocol_defs.c 1 addition, 0 deletionssrc/common/slurm_protocol_defs.c
- src/plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c 1 addition, 1 deletion...plugins/acct_gather_energy/rapl/acct_gather_energy_rapl.c
- src/plugins/mpi/pmi2/pmi1.c 6 additions, 4 deletionssrc/plugins/mpi/pmi2/pmi1.c
- src/plugins/sched/wiki/get_nodes.c 1 addition, 1 deletionsrc/plugins/sched/wiki/get_nodes.c
- src/plugins/sched/wiki2/get_nodes.c 1 addition, 1 deletionsrc/plugins/sched/wiki2/get_nodes.c
- src/plugins/select/cons_res/job_test.c 1 addition, 2 deletionssrc/plugins/select/cons_res/job_test.c
- src/plugins/select/cons_res/select_cons_res.c 5 additions, 5 deletionssrc/plugins/select/cons_res/select_cons_res.c
- src/plugins/select/linear/select_linear.c 7 additions, 3 deletionssrc/plugins/select/linear/select_linear.c
- src/plugins/select/serial/job_test.c 1 addition, 1 deletionsrc/plugins/select/serial/job_test.c
- src/sacctmgr/account_functions.c 1 addition, 0 deletionssrc/sacctmgr/account_functions.c
- src/sacctmgr/qos_functions.c 3 additions, 0 deletionssrc/sacctmgr/qos_functions.c
- src/sacctmgr/user_functions.c 4 additions, 0 deletionssrc/sacctmgr/user_functions.c
- src/slurmctld/job_mgr.c 14 additions, 7 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/proc_req.c 1 addition, 1 deletionsrc/slurmctld/proc_req.c
Loading
Please register or sign in to comment