svn merge -r16250:16286 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 6 additions, 0 deletionsNEWS
- doc/man/man1/sacct.1 38 additions, 0 deletionsdoc/man/man1/sacct.1
- doc/man/man1/sreport.1 3 additions, 2 deletionsdoc/man/man1/sreport.1
- doc/man/man5/slurm.conf.5 3 additions, 0 deletionsdoc/man/man5/slurm.conf.5
- src/common/slurmdbd_defs.c 22 additions, 10 deletionssrc/common/slurmdbd_defs.c
- src/plugins/select/bluegene/plugin/bg_job_place.c 1 addition, 26 deletionssrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bg_record_functions.c 3 additions, 1 deletionsrc/plugins/select/bluegene/plugin/bg_record_functions.c
- src/plugins/select/bluegene/plugin/bg_record_functions.h 1 addition, 1 deletionsrc/plugins/select/bluegene/plugin/bg_record_functions.h
- src/slurmd/common/set_oomadj.c 66 additions, 0 deletionssrc/slurmd/common/set_oomadj.c
- src/slurmd/common/set_oomadj.h 46 additions, 0 deletionssrc/slurmd/common/set_oomadj.h
- src/slurmd/slurmd/Makefile.am 2 additions, 0 deletionssrc/slurmd/slurmd/Makefile.am
- src/slurmd/slurmd/Makefile.in 18 additions, 1 deletionsrc/slurmd/slurmd/Makefile.in
- src/slurmd/slurmd/slurmd.c 3 additions, 0 deletionssrc/slurmd/slurmd/slurmd.c
- src/slurmd/slurmstepd/Makefile.am 2 additions, 0 deletionssrc/slurmd/slurmstepd/Makefile.am
- src/slurmd/slurmstepd/Makefile.in 19 additions, 1 deletionsrc/slurmd/slurmstepd/Makefile.in
- src/slurmd/slurmstepd/mgr.c 4 additions, 0 deletionssrc/slurmd/slurmstepd/mgr.c
- src/slurmd/slurmstepd/slurmstepd.c 3 additions, 0 deletionssrc/slurmd/slurmstepd/slurmstepd.c
- src/slurmd/slurmstepd/task.c 29 additions, 3 deletionssrc/slurmd/slurmstepd/task.c
Loading
Please register or sign in to comment