svn merge -r12335:12340 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2
Showing
- NEWS 5 additions, 1 deletionNEWS
- doc/html/maui.shtml 9 additions, 4 deletionsdoc/html/maui.shtml
- doc/man/man5/wiki.conf.5 8 additions, 9 deletionsdoc/man/man5/wiki.conf.5
- src/plugins/sched/wiki/msg.c 25 additions, 0 deletionssrc/plugins/sched/wiki/msg.c
- src/plugins/sched/wiki/msg.h 3 additions, 0 deletionssrc/plugins/sched/wiki/msg.h
- src/plugins/sched/wiki/sched_wiki.c 19 additions, 2 deletionssrc/plugins/sched/wiki/sched_wiki.c
- src/slurmctld/agent.c 7 additions, 6 deletionssrc/slurmctld/agent.c
- src/slurmctld/job_mgr.c 24 additions, 9 deletionssrc/slurmctld/job_mgr.c
Loading
Please register or sign in to comment