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

Merge branch 'slurm-2.6' 

Conflicts:
	META
	src/plugins/priority/multifactor/priority_multifactor.c
parents 4a9cb5a4 1e1d7fb3
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