svn merge -r9908:9923 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
Showing
- NEWS 6 additions, 0 deletionsNEWS
- doc/man/man5/wiki.conf.5 3 additions, 3 deletionsdoc/man/man5/wiki.conf.5
- src/common/slurm_protocol_socket_implementation.c 22 additions, 1 deletionsrc/common/slurm_protocol_socket_implementation.c
- src/plugins/sched/wiki2/event.c 7 additions, 1 deletionsrc/plugins/sched/wiki2/event.c
- src/plugins/sched/wiki2/msg.c 4 additions, 0 deletionssrc/plugins/sched/wiki2/msg.c
- src/plugins/select/bluegene/plugin/bg_block_info.c 42 additions, 5 deletionssrc/plugins/select/bluegene/plugin/bg_block_info.c
- src/plugins/select/bluegene/plugin/bg_job_run.c 3 additions, 4 deletionssrc/plugins/select/bluegene/plugin/bg_job_run.c
- src/plugins/select/bluegene/plugin/bg_switch_connections.c 25 additions, 12 deletionssrc/plugins/select/bluegene/plugin/bg_switch_connections.c
- src/plugins/select/bluegene/plugin/bluegene.c 97 additions, 9 deletionssrc/plugins/select/bluegene/plugin/bluegene.c
- src/plugins/select/bluegene/plugin/bluegene.h 1 addition, 1 deletionsrc/plugins/select/bluegene/plugin/bluegene.h
- src/slurmctld/controller.c 5 additions, 3 deletionssrc/slurmctld/controller.c
- testsuite/expect/test9.7.bash 12 additions, 7 deletionstestsuite/expect/test9.7.bash
Loading
Please register or sign in to comment