Skip to content
GitLab
Commit 054352f7 authored by jette's avatar jette
Browse files

Merge branch 'slurm-2.6' 

Conflicts:
	src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
	src/srun/libsrun/opt.c
parents 430bedb2 151ff932
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