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

Merge branch 'slurm-16.05' 

Conflicts:
	src/common/slurm_acct_gather_profile.c
parents 534c785a bc359c6a
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