Skip to content
GitLab
Commit 8812fabe authored by Brian Christiansen's avatar Brian Christiansen
Browse files

Merge remote-tracking branch 'origin/slurm-14.11' into slurm-15.08 

Conflicts:
	NEWS
	src/slurmctld/job_mgr.c
	src/srun/libsrun/launch.c
parents dfaa33ee 0bf0e71f
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