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

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

Conflicts:
	src/plugins/select/bluegene/select_bluegene.c
	src/slurmctld/step_mgr.c
parents 0510a95b 8b76b93c
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