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

Merge branch 'slurm-2.6' 

Conflicts:
	src/squeue/print.c
	src/sview/job_info.c
parents dd7909c9 17f27007
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