Skip to content
GitLab
Commit 14ee12a1 authored by Danny Auble's avatar Danny Auble
Browse files

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

Conflicts:
	src/plugins/accounting_storage/mysql/as_mysql_rollup.c
	src/slurmctld/acct_policy.c
parents cca465da a507ddcb
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