svn merge -r8249:8263 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1
Showing
- NEWS 1 addition, 0 deletionsNEWS
- doc/html/documentation.shtml 4 additions, 2 deletionsdoc/html/documentation.shtml
- doc/html/help.shtml 5 additions, 3 deletionsdoc/html/help.shtml
- doc/man/man8/slurmctld.8 5 additions, 2 deletionsdoc/man/man8/slurmctld.8
- doc/man/man8/slurmd.8 5 additions, 2 deletionsdoc/man/man8/slurmd.8
- src/common/parse_config.c 11 additions, 8 deletionssrc/common/parse_config.c
- src/common/read_config.c 5 additions, 4 deletionssrc/common/read_config.c
- src/slurmctld/controller.c 5 additions, 1 deletionsrc/slurmctld/controller.c
- src/slurmd/slurmd/slurmd.c 5 additions, 1 deletionsrc/slurmd/slurmd/slurmd.c
Loading
Please register or sign in to comment