Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11
Conflicts: doc/man/man1/scontrol.1
Showing
- doc/html/hdf5_profile_user_guide.shtml 8 additions, 8 deletionsdoc/html/hdf5_profile_user_guide.shtml
- doc/man/man1/scontrol.1 1 addition, 1 deletiondoc/man/man1/scontrol.1
- doc/man/man1/slurm.1 1 addition, 1 deletiondoc/man/man1/slurm.1
- doc/man/man5/slurm.conf.5 4 additions, 4 deletionsdoc/man/man5/slurm.conf.5
Loading
Please register or sign in to comment