Skip to content
GitLab
Commit 67767a5a authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-15.08' into slurm-16.05 

Run autogen.sh to pickup changes and resolve conflicts.
parents 49ab5379 02daeacb
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