Skip to content
GitLab
Commit 27cba3b6 authored by Danny Auble's avatar Danny Auble
Browse files

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

# Conflicts:
#	src/slurmctld/acct_policy.c
#	testsuite/expect/README
#	testsuite/expect/globals
#	testsuite/expect/test21.39
parents 636cea00 0bd1ee9b
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