svn merge -r15766:15796 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3
Showing
- NEWS 10 additions, 1 deletionNEWS
- configure 4 additions, 3 deletionsconfigure
- configure.ac 3 additions, 2 deletionsconfigure.ac
- src/api/step_launch.c 1 addition, 1 deletionsrc/api/step_launch.c
- src/plugins/sched/wiki2/job_modify.c 10 additions, 4 deletionssrc/plugins/sched/wiki2/job_modify.c
- src/sacctmgr/association_functions.c 14 additions, 0 deletionssrc/sacctmgr/association_functions.c
- src/sacctmgr/qos_functions.c 15 additions, 0 deletionssrc/sacctmgr/qos_functions.c
- src/sacctmgr/sacctmgr.c 3 additions, 3 deletionssrc/sacctmgr/sacctmgr.c
- src/sacctmgr/txn_functions.c 15 additions, 0 deletionssrc/sacctmgr/txn_functions.c
- src/sacctmgr/user_functions.c 5 additions, 5 deletionssrc/sacctmgr/user_functions.c
- src/slurmctld/agent.c 2 additions, 0 deletionssrc/slurmctld/agent.c
- src/slurmctld/agent.h 1 addition, 1 deletionsrc/slurmctld/agent.h
- src/slurmctld/controller.c 3 additions, 1 deletionsrc/slurmctld/controller.c
- src/slurmctld/node_mgr.c 2 additions, 2 deletionssrc/slurmctld/node_mgr.c
- src/slurmctld/ping_nodes.c 10 additions, 6 deletionssrc/slurmctld/ping_nodes.c
- src/slurmctld/proc_req.c 8 additions, 3 deletionssrc/slurmctld/proc_req.c
- src/slurmctld/slurmctld.h 16 additions, 3 deletionssrc/slurmctld/slurmctld.h
- src/slurmd/common/run_script.c 2 additions, 2 deletionssrc/slurmd/common/run_script.c
- src/slurmdbd/proc_req.c 4 additions, 0 deletionssrc/slurmdbd/proc_req.c
- testsuite/slurm_unit/Makefile.am 1 addition, 1 deletiontestsuite/slurm_unit/Makefile.am
Loading
Please register or sign in to comment