Skip to content
GitLab
Commit e9bf5a5b authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-2.6' into slurm-14.03 

Conflicts:
	NEWS
	src/slurmctld/backup.c
	src/slurmctld/controller.c
	src/slurmctld/proc_req.c
parents 36ba24c7 9fe5c605
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