Merge remote-tracking branch 'origin/slurm-2.4'
Conflicts: configure
No related branches found
No related tags found
Showing
- Makefile.am 3 additions, 3 deletionsMakefile.am
- Makefile.in 11 additions, 4 deletionsMakefile.in
- NEWS 2 additions, 0 deletionsNEWS
- configure 27 additions, 10 deletionsconfigure
- configure.ac 14 additions, 9 deletionsconfigure.ac
- etc/init.d.slurm.in 4 additions, 4 deletionsetc/init.d.slurm.in
- etc/init.d.slurmdbd.in 3 additions, 3 deletionsetc/init.d.slurmdbd.in
- slurm.spec 7 additions, 7 deletionsslurm.spec
- src/plugins/checkpoint/poe/Makefile.am 6 additions, 5 deletionssrc/plugins/checkpoint/poe/Makefile.am
- src/plugins/checkpoint/poe/Makefile.in 202 additions, 28 deletionssrc/plugins/checkpoint/poe/Makefile.in
- src/plugins/priority/multifactor/priority_multifactor.c 12 additions, 3 deletionssrc/plugins/priority/multifactor/priority_multifactor.c
Loading
Please register or sign in to comment