svn merge -r8457:8480 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
Showing
- NEWS 10 additions, 3 deletionsNEWS
- doc/html/configurator.html 4 additions, 4 deletionsdoc/html/configurator.html
- doc/html/switchplugins.shtml 29 additions, 5 deletionsdoc/html/switchplugins.shtml
- doc/man/man5/slurm.conf.5 8 additions, 5 deletionsdoc/man/man5/slurm.conf.5
- slurm/slurm.h.in 0 additions, 1 deletionslurm/slurm.h.in
- src/api/step_client_io.c 14 additions, 3 deletionssrc/api/step_client_io.c
- src/common/bitstring.h 9 additions, 1 deletionsrc/common/bitstring.h
- src/common/fd.c 11 additions, 0 deletionssrc/common/fd.c
- src/common/slurm_protocol_defs.c 0 additions, 4 deletionssrc/common/slurm_protocol_defs.c
- src/common/slurm_protocol_defs.h 0 additions, 1 deletionsrc/common/slurm_protocol_defs.h
- src/common/slurm_protocol_pack.c 0 additions, 2 deletionssrc/common/slurm_protocol_pack.c
- src/common/switch.c 23 additions, 0 deletionssrc/common/switch.c
- src/common/switch.h 19 additions, 1 deletionsrc/common/switch.h
- src/plugins/switch/elan/switch_elan.c 12 additions, 1 deletionsrc/plugins/switch/elan/switch_elan.c
- src/plugins/switch/federation/federation.c 115 additions, 14 deletionssrc/plugins/switch/federation/federation.c
- src/plugins/switch/federation/switch_federation.c 18 additions, 3 deletionssrc/plugins/switch/federation/switch_federation.c
- src/plugins/switch/none/switch_none.c 12 additions, 1 deletionsrc/plugins/switch/none/switch_none.c
- src/slurmctld/job_mgr.c 69 additions, 132 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/node_mgr.c 9 additions, 7 deletionssrc/slurmctld/node_mgr.c
- src/slurmctld/node_scheduler.c 3 additions, 1 deletionsrc/slurmctld/node_scheduler.c
Loading
Please register or sign in to comment