svn merge -r17929:17951 https://eris.llnl.gov/svn/slurm/branches/slurm-2.0
Showing
- NEWS 1 addition, 0 deletionsNEWS
- doc/man/man5/slurm.conf.5 8 additions, 6 deletionsdoc/man/man5/slurm.conf.5
- src/api/signal.c 1 addition, 1 deletionsrc/api/signal.c
- src/common/assoc_mgr.c 12 additions, 4 deletionssrc/common/assoc_mgr.c
- src/plugins/accounting_storage/filetxt/filetxt_jobacct_process.c 6 additions, 2 deletions...gins/accounting_storage/filetxt/filetxt_jobacct_process.c
- src/plugins/priority/multifactor/priority_multifactor.c 6 additions, 2 deletionssrc/plugins/priority/multifactor/priority_multifactor.c
- src/plugins/proctrack/linuxproc/kill_tree.c 6 additions, 2 deletionssrc/plugins/proctrack/linuxproc/kill_tree.c
- src/plugins/select/bluegene/plugin/select_bluegene.c 6 additions, 2 deletionssrc/plugins/select/bluegene/plugin/select_bluegene.c
- src/sacctmgr/sacctmgr.c 3 additions, 1 deletionsrc/sacctmgr/sacctmgr.c
- src/scancel/scancel.c 4 additions, 1 deletionsrc/scancel/scancel.c
- src/scontrol/scontrol.c 4 additions, 1 deletionsrc/scontrol/scontrol.c
- src/scontrol/update_job.c 13 additions, 12 deletionssrc/scontrol/update_job.c
- src/slurmctld/agent.c 5 additions, 3 deletionssrc/slurmctld/agent.c
- src/slurmctld/job_mgr.c 12 additions, 4 deletionssrc/slurmctld/job_mgr.c
- src/slurmctld/node_mgr.c 6 additions, 2 deletionssrc/slurmctld/node_mgr.c
- src/slurmctld/partition_mgr.c 6 additions, 2 deletionssrc/slurmctld/partition_mgr.c
- src/slurmctld/reservation.c 6 additions, 2 deletionssrc/slurmctld/reservation.c
- src/slurmctld/trigger_mgr.c 6 additions, 2 deletionssrc/slurmctld/trigger_mgr.c
- src/slurmd/slurmd/req.c 16 additions, 4 deletionssrc/slurmd/slurmd/req.c
- src/slurmd/slurmd/slurmd.c 8 additions, 3 deletionssrc/slurmd/slurmd/slurmd.c
Loading
Please register or sign in to comment