Merge remote-tracking branch 'origin/slurm-2.6'
Conflicts: src/common/stepd_api.c
No related branches found
No related tags found
Showing
- NEWS 1 addition, 0 deletionsNEWS
- src/common/slurm_jobacct_gather.c 176 additions, 5 deletionssrc/common/slurm_jobacct_gather.c
- src/common/slurm_jobacct_gather.h 4 additions, 2 deletionssrc/common/slurm_jobacct_gather.h
- src/common/stepd_api.c 8 additions, 6 deletionssrc/common/stepd_api.c
- src/common/stepd_api.h 11 additions, 8 deletionssrc/common/stepd_api.h
- src/slurmd/slurmd/req.c 38 additions, 12 deletionssrc/slurmd/slurmd/req.c
- src/slurmd/slurmd/slurmd.c 4 additions, 0 deletionssrc/slurmd/slurmd/slurmd.c
- src/slurmd/slurmstepd/mgr.c 4 additions, 2 deletionssrc/slurmd/slurmstepd/mgr.c
- src/slurmd/slurmstepd/req.c 4 additions, 2 deletionssrc/slurmd/slurmstepd/req.c
Loading
Please register or sign in to comment