svn merge -r11740:11767 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- BUILD.NOTES 2 additions, 0 deletionsBUILD.NOTES
- META 2 additions, 2 deletionsMETA
- NEWS 6 additions, 0 deletionsNEWS
- doc/man/man5/slurm.conf.5 16 additions, 29 deletionsdoc/man/man5/slurm.conf.5
- src/common/slurm_protocol_socket_implementation.c 1 addition, 1 deletionsrc/common/slurm_protocol_socket_implementation.c
- src/plugins/sched/wiki/get_nodes.c 3 additions, 3 deletionssrc/plugins/sched/wiki/get_nodes.c
- src/plugins/sched/wiki2/get_nodes.c 3 additions, 3 deletionssrc/plugins/sched/wiki2/get_nodes.c
- src/slurmctld/node_mgr.c 14 additions, 8 deletionssrc/slurmctld/node_mgr.c
- src/slurmctld/read_config.c 18 additions, 4 deletionssrc/slurmctld/read_config.c
Loading
Please register or sign in to comment