svn merge -r10737:10749 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
Showing
- NEWS 3 additions, 0 deletionsNEWS
- doc/man/man1/sbcast.1 4 additions, 3 deletionsdoc/man/man1/sbcast.1
- src/api/pmi_server.c 1 addition, 1 deletionsrc/api/pmi_server.c
- src/api/slurm_pmi.c 21 additions, 7 deletionssrc/api/slurm_pmi.c
- src/common/slurm_protocol_api.c 1 addition, 1 deletionsrc/common/slurm_protocol_api.c
- src/plugins/switch/elan/switch_elan.c 1 addition, 1 deletionsrc/plugins/switch/elan/switch_elan.c
- src/srun/opt.h 1 addition, 1 deletionsrc/srun/opt.h
- testsuite/expect/test7.2 5 additions, 2 deletionstestsuite/expect/test7.2
Loading
Please register or sign in to comment