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

Merge branch 'slurm-14.11' 

Conflicts:
	src/common/slurm_protocol_api.c
	src/slurmctld/proc_req.c
	src/slurmd/slurmd/req.c
parents 3d2855dd 595d673e
Expand all 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