Skip to content
GitLab
Commit 1e462faf authored by David Bigagli's avatar David Bigagli
Browse files

Merge remote branch 'origin/slurm-14.03' into slurm-14.11 

Conflicts:
	src/slurmctld/job_scheduler.c
	src/slurmd/slurmd/req.c
parents 1bbce7d8 7644f970
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