svn merge -r19300:19304 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1
Showing
- NEWS 2 additions, 1 deletionNEWS
- doc/man/man1/sinfo.1 2 additions, 2 deletionsdoc/man/man1/sinfo.1
- doc/man/man1/squeue.1 2 additions, 2 deletionsdoc/man/man1/squeue.1
- doc/man/man1/sview.1 1 addition, 1 deletiondoc/man/man1/sview.1
- doc/man/man3/slurm_allocate_resources.3 5 additions, 5 deletionsdoc/man/man3/slurm_allocate_resources.3
- doc/man/man5/bluegene.conf.5 1 addition, 1 deletiondoc/man/man5/bluegene.conf.5
- doc/man/man5/topology.conf.5 1 addition, 1 deletiondoc/man/man5/topology.conf.5
- doc/man/man5/wiki.conf.5 2 additions, 2 deletionsdoc/man/man5/wiki.conf.5
- src/api/allocate.c 1 addition, 1 deletionsrc/api/allocate.c
- src/common/forward.h 1 addition, 1 deletionsrc/common/forward.h
- src/common/slurm_protocol_api.c 1 addition, 1 deletionsrc/common/slurm_protocol_api.c
- src/common/slurm_protocol_api.h 1 addition, 1 deletionsrc/common/slurm_protocol_api.h
- src/common/slurm_protocol_interface.h 1 addition, 1 deletionsrc/common/slurm_protocol_interface.h
- src/plugins/auth/authd/auth_authd.c 1 addition, 1 deletionsrc/plugins/auth/authd/auth_authd.c
- src/plugins/auth/munge/auth_munge.c 1 addition, 1 deletionsrc/plugins/auth/munge/auth_munge.c
- src/plugins/auth/none/auth_none.c 1 addition, 1 deletionsrc/plugins/auth/none/auth_none.c
- src/plugins/sched/wiki/msg.c 1 addition, 1 deletionsrc/plugins/sched/wiki/msg.c
- src/plugins/select/bluegene/plugin/bg_job_place.c 1 addition, 1 deletionsrc/plugins/select/bluegene/plugin/bg_job_place.c
- src/plugins/select/bluegene/plugin/bg_job_place.h 1 addition, 1 deletionsrc/plugins/select/bluegene/plugin/bg_job_place.h
- src/plugins/task/affinity/task_affinity.c 1 addition, 1 deletionsrc/plugins/task/affinity/task_affinity.c
Loading
Please register or sign in to comment