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

Merge remote-tracking branch 'origin/slurm-14.11' into slurm-15.08 

Conflicts:
	NEWS
	src/slurmctld/acct_policy.c
parents d56c72a3 add3d8cd
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