svn merge -r12856:12863 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 6 additions, 0 deletionsNEWS
- src/plugins/select/bluegene/plugin/sfree.c 4 additions, 1 deletionsrc/plugins/select/bluegene/plugin/sfree.c
- src/slurmctld/controller.c 1 addition, 0 deletionssrc/slurmctld/controller.c
- src/slurmctld/job_mgr.c 15 additions, 9 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/job_scheduler.c 40 additions, 0 deletionssrc/slurmctld/job_scheduler.c
- src/slurmctld/node_scheduler.c 10 additions, 4 deletionssrc/slurmctld/node_scheduler.c
- src/slurmctld/slurmctld.h 10 additions, 2 deletionssrc/slurmctld/slurmctld.h
- src/smap/smap.c 7 additions, 4 deletionssrc/smap/smap.c
Loading
Please register or sign in to comment