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

Merge branch 'slurm-14.11' 

Conflicts:
	src/scancel/scancel.c
	src/scancel/scancel.h
parents 7fac3a5d 5cb067fc
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