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

Merge remote-tracking branch 'origin/slurm-2.4' 

Conflicts:
	src/common/slurm_cred.c
	testsuite/expect/test12.2
parents f846be6b 79ddd5dc
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