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

Merge remote-tracking branch 'origin/slurm-16.05' into slurm-17.02 

# Conflicts:
#	META
#	NEWS
#	src/slurmctld/agent.c
parents 40a9bc5f 50e2255a
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