svn merge -r12403:12413 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 2 additions, 0 deletionsNEWS
- src/common/timers.c 6 additions, 3 deletionssrc/common/timers.c
- src/common/timers.h 5 additions, 3 deletionssrc/common/timers.h
- src/plugins/select/bluegene/block_allocator/block_allocator.c 6 additions, 6 deletions...plugins/select/bluegene/block_allocator/block_allocator.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 1 addition, 2 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/slurmctld/controller.c 2 additions, 5 deletionssrc/slurmctld/controller.c
- src/slurmctld/job_mgr.c 5 additions, 3 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/job_scheduler.c 3 additions, 0 deletionssrc/slurmctld/job_scheduler.c
- src/slurmctld/node_mgr.c 2 additions, 5 deletionssrc/slurmctld/node_mgr.c
- src/slurmctld/partition_mgr.c 1 addition, 2 deletionssrc/slurmctld/partition_mgr.c
- src/slurmctld/proc_req.c 55 additions, 38 deletionssrc/slurmctld/proc_req.c
- src/slurmctld/read_config.c 1 addition, 4 deletionssrc/slurmctld/read_config.c
Loading
Please register or sign in to comment