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

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

# Conflicts:
#	src/plugins/node_features/knl_cray/node_features_knl_cray.c
parents 7380254f b319d5b1
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