Skip to content
GitLab
Commit dcac69c9 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-15.08' 

Conflicts:
	src/scontrol/info_assoc_mgr.c
parents 06e49a30 3bf84c90
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