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

Merge branch 'slurm-2.6' into slurm-14.03 

Conflicts:
	src/sinfo/sort.c
parents 73192e1e ff518ad1
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