Skip to content
GitLab
Commit f5d6b175 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/plugins/accounting_storage/mysql/as_mysql_job.c
parents 8e949f72 75ea13a3
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