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

Merge branch 'slurm-2.6' into slurm-14.03 

Conflicts:
	src/common/slurm_protocol_api.c
parents 4e8bacc2 3053885f
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