Skip to content
GitLab
Commit 4b48a3a2 authored by Brian Christiansen's avatar Brian Christiansen
Browse files

Merge remote-tracking branch 'origin/slurm-14.11' 

Conflicts:
	doc/man/man1/sacct.1
	doc/man/man1/srun.1
	src/sacct/sacct.h
parents 0601e0e9 2f477b42
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment