Skip to content
GitLab
Commit 03f6e261 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.6' into slurm-14.03 

Conflicts:
	src/slurmctld/job_mgr.c
parents 09cf5238 68a4bfd7
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