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

Merge branch 'slurm-14.11' 

Conflicts:
	testsuite/expect/globals
	testsuite/expect/test12.4
parents 1c235411 22b7f1ad
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