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

Merge branch 'slurm-14.11' into slurm-15.08 

Conflicts:
	contribs/pmi2/testpmi2.c
	src/slurmctld/node_scheduler.c
parents 24f51d67 a9dc0097
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