svn merge -r14620:14652 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 2 additions, 0 deletionsNEWS
- src/common/read_config.c 4 additions, 4 deletionssrc/common/read_config.c
- src/common/uid.c 107 additions, 20 deletionssrc/common/uid.c
- src/common/uid.h 5 additions, 0 deletionssrc/common/uid.h
- src/plugins/jobcomp/filetxt/jobcomp_filetxt.c 5 additions, 11 deletionssrc/plugins/jobcomp/filetxt/jobcomp_filetxt.c
- src/plugins/sched/wiki/get_jobs.c 1 addition, 12 deletionssrc/plugins/sched/wiki/get_jobs.c
- src/plugins/sched/wiki2/get_jobs.c 1 addition, 12 deletionssrc/plugins/sched/wiki2/get_jobs.c
- src/plugins/select/bluegene/plugin/block_sys.c 12 additions, 11 deletionssrc/plugins/select/bluegene/plugin/block_sys.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 6 additions, 5 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/slurmctld/partition_mgr.c 46 additions, 29 deletionssrc/slurmctld/partition_mgr.c
- src/slurmd/slurmd/req.c 11 additions, 9 deletionssrc/slurmd/slurmd/req.c
Loading
Please register or sign in to comment