svn merge -r12023:12089 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 5 additions, 0 deletionsNEWS
- configure 2 additions, 1 deletionconfigure
- configure.ac 1 addition, 0 deletionsconfigure.ac
- contribs/torque/mpiexec.pl 83 additions, 7 deletionscontribs/torque/mpiexec.pl
- contribs/torque/qsub.pl 31 additions, 7 deletionscontribs/torque/qsub.pl
- doc/html/checkpoint_plugins.shtml 31 additions, 36 deletionsdoc/html/checkpoint_plugins.shtml
- doc/html/configurator.html.in 1 addition, 0 deletionsdoc/html/configurator.html.in
- doc/html/documentation.shtml 1 addition, 1 deletiondoc/html/documentation.shtml
- doc/html/maui.shtml 10 additions, 2 deletionsdoc/html/maui.shtml
- doc/html/moab.shtml 19 additions, 3 deletionsdoc/html/moab.shtml
- doc/man/man1/srun.1 7 additions, 0 deletionsdoc/man/man1/srun.1
- doc/man/man5/slurm.conf.5 4 additions, 1 deletiondoc/man/man5/slurm.conf.5
- doc/man/man5/wiki.conf.5 17 additions, 15 deletionsdoc/man/man5/wiki.conf.5
- slurm.spec 1 addition, 0 deletionsslurm.spec
- src/api/pmi_server.c 30 additions, 1 deletionsrc/api/pmi_server.c
- src/api/slurm_pmi.c 30 additions, 5 deletionssrc/api/slurm_pmi.c
- src/common/forward.c 8 additions, 5 deletionssrc/common/forward.c
- src/common/forward.h 0 additions, 2 deletionssrc/common/forward.h
- src/common/slurm_protocol_api.c 16 additions, 12 deletionssrc/common/slurm_protocol_api.c
- src/common/slurm_protocol_defs.c 16 additions, 1 deletionsrc/common/slurm_protocol_defs.c
Loading
Please register or sign in to comment