Skip to content
GitLab
Commit 72fbf931 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-14.11' into slurm-15.08 

Conflicts:
	src/slurmctld/job_scheduler.c
parents 6cbff5bd da4f5684
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