Skip to content
GitLab
Commit 18d0c440 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'knl' 

Conflicts:
	src/slurmctld/read_config.c
parents 1af7c0f4 5e1cff68
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