svn merge -r12797:12809 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 2 additions, 0 deletionsNEWS
- auxdir/x_ac_perl.m4 1 addition, 1 deletionauxdir/x_ac_perl.m4
- configure 1 addition, 1 deletionconfigure
- src/common/Makefile.am 2 additions, 2 deletionssrc/common/Makefile.am
- src/common/Makefile.in 2 additions, 2 deletionssrc/common/Makefile.in
- src/common/optz.h 3 additions, 1 deletionsrc/common/optz.h
- src/common/parse_time.c 3 additions, 1 deletionsrc/common/parse_time.c
- src/common/plugstack.h 3 additions, 1 deletionsrc/common/plugstack.h
- src/common/stepd_api.c 4 additions, 1 deletionsrc/common/stepd_api.c
- src/srun/multi_prog.c 30 additions, 29 deletionssrc/srun/multi_prog.c
Loading
Please register or sign in to comment