svn merge -r15449:15487 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 11 additions, 4 deletionsNEWS
- doc/man/man1/scontrol.1 1 addition, 1 deletiondoc/man/man1/scontrol.1
- src/common/env.c 38 additions, 6 deletionssrc/common/env.c
- src/common/env.h 2 additions, 1 deletionsrc/common/env.h
- src/plugins/sched/wiki2/get_jobs.c 7 additions, 1 deletionsrc/plugins/sched/wiki2/get_jobs.c
- src/salloc/salloc.c 2 additions, 1 deletionsrc/salloc/salloc.c
- src/slurmctld/job_mgr.c 12 additions, 1 deletionsrc/slurmctld/job_mgr.c
- src/slurmd/slurmstepd/mgr.c 3 additions, 33 deletionssrc/slurmd/slurmstepd/mgr.c
- src/squeue/print.c 0 additions, 2 deletionssrc/squeue/print.c
- testsuite/expect/Makefile.am 1 addition, 0 deletionstestsuite/expect/Makefile.am
- testsuite/expect/Makefile.in 1 addition, 0 deletionstestsuite/expect/Makefile.in
- testsuite/expect/README 1 addition, 0 deletionstestsuite/expect/README
- testsuite/expect/test21.22 1027 additions, 0 deletionstestsuite/expect/test21.22
Loading
Please register or sign in to comment