Merge branch 'slurm-14.11'
Conflicts: META NEWS
Showing
- NEWS 3 additions, 0 deletionsNEWS
- doc/html/Makefile.am 0 additions, 1 deletiondoc/html/Makefile.am
- doc/html/Makefile.in 0 additions, 1 deletiondoc/html/Makefile.in
- doc/html/meetings.shtml 3 additions, 4 deletionsdoc/html/meetings.shtml
- doc/html/slurm_ug_agenda.shtml 310 additions, 805 deletionsdoc/html/slurm_ug_agenda.shtml
- doc/html/slurm_ug_registration.shtml 0 additions, 62 deletionsdoc/html/slurm_ug_registration.shtml
- src/slurmctld/job_mgr.c 4 additions, 2 deletionssrc/slurmctld/job_mgr.c
- testsuite/expect/test1.74 1 addition, 1 deletiontestsuite/expect/test1.74
Loading
Please register or sign in to comment