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

Merge branch 'slurm-2.6' 

Conflicts:
	src/plugins/select/bluegene/select_bluegene.c
	src/plugins/select/linear/select_linear.c
parents 2ecf69a6 7766055b
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