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

Merge branch 'slurm-15.08' 

Conflicts:
	NEWS
	src/plugins/accounting_storage/mysql/as_mysql_resv.c
parents dced435d 49d483db
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