Skip to content
GitLab
Commit 6e8488de authored by jette's avatar jette
Browse files

Merge branch 'slurm-2.6' 

Conflicts:
	NEWS
	src/slurmd/slurmd/req.c
parents dd6f66f5 1b0c4a33
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