Merge branch 'slurm-14.11'
Conflicts: src/slurmctld/job_mgr.c
No related branches found
No related tags found
Showing
- NEWS 4 additions, 3 deletionsNEWS
- contribs/perlapi/libslurm/perl/Slurm.xs 2 additions, 2 deletionscontribs/perlapi/libslurm/perl/Slurm.xs
- doc/html/troubleshoot.shtml 1 addition, 1 deletiondoc/html/troubleshoot.shtml
- doc/man/man1/sinfo.1 1 addition, 1 deletiondoc/man/man1/sinfo.1
- doc/man/man1/srun.1 1 addition, 1 deletiondoc/man/man1/srun.1
- doc/man/man5/slurm.conf.5 1 addition, 1 deletiondoc/man/man5/slurm.conf.5
- slurm.spec 3 additions, 3 deletionsslurm.spec
- src/sacctmgr/archive_functions.c 1 addition, 1 deletionsrc/sacctmgr/archive_functions.c
- src/slurmctld/job_mgr.c 2 additions, 2 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/node_scheduler.c 2 additions, 1 deletionsrc/slurmctld/node_scheduler.c
- testsuite/expect/test7.17.prog.c 2 additions, 2 deletionstestsuite/expect/test7.17.prog.c
Loading
Please register or sign in to comment