Skip to content
GitLab
Commit 32ced6da authored by Danny Auble's avatar Danny Auble
Browse files

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

# Conflicts:
#	src/common/node_conf.c
parents b89c4592 5a68feb1
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