Skip to content
GitLab
Commit 840374b2 authored by Brian Christiansen's avatar Brian Christiansen
Browse files

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

Conflicts:
	etc/slurmd.service.in
parents fbe74680 508f866e
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