Skip to content
GitLab
Commit 095b8f38 authored by Danny Auble's avatar Danny Auble
Browse files

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

# Conflicts:
#	src/slurmctld/node_mgr.c
parents 7acf5135 39095f0d
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