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

Merge branch 'slurm-14.03' 

Conflicts:
	src/common/gres.c
	src/sview/job_info.c
parents 9e22e37f f6c7ca22
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