svn merge -r21108:21131 https://eris.llnl.gov/svn/slurm/branches/slurm-2.1
Showing
- NEWS 5 additions, 0 deletionsNEWS
- doc/man/man5/wiki.conf.5 10 additions, 0 deletionsdoc/man/man5/wiki.conf.5
- src/common/assoc_mgr.c 1 addition, 1 deletionsrc/common/assoc_mgr.c
- src/plugins/sched/wiki/get_nodes.c 34 additions, 0 deletionssrc/plugins/sched/wiki/get_nodes.c
- src/plugins/sched/wiki/msg.c 48 additions, 4 deletionssrc/plugins/sched/wiki/msg.c
- src/plugins/sched/wiki/msg.h 1 addition, 0 deletionssrc/plugins/sched/wiki/msg.h
- src/plugins/sched/wiki2/get_nodes.c 34 additions, 0 deletionssrc/plugins/sched/wiki2/get_nodes.c
- src/plugins/sched/wiki2/msg.c 48 additions, 4 deletionssrc/plugins/sched/wiki2/msg.c
- src/plugins/sched/wiki2/msg.h 1 addition, 0 deletionssrc/plugins/sched/wiki2/msg.h
- testsuite/expect/test7.7 10 additions, 9 deletionstestsuite/expect/test7.7
- testsuite/expect/test7.8 9 additions, 0 deletionstestsuite/expect/test7.8
Loading
Please register or sign in to comment