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

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

Conflicts:
	NEWS
	src/common/slurm_protocol_api.c
	src/plugins/select/cray/basil_interface.c
	src/srun/libsrun/opt.c
	src/srun/srun_job.c
parents c157ccfc 7eb1a451
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