Skip to content
GitLab
Commit dee47d93 authored by Brian Christiansen's avatar Brian Christiansen
Browse files

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

Conflicts:
	contribs/perlapi/libslurm/perl/Slurm.xs
	slurm/slurm.h.in
	src/slurmctld/job_mgr.c
	src/slurmctld/step_mgr.c
	src/srun/libsrun/launch.c
	src/srun/libsrun/opt.c
parents 790bbac0 53b85d34
Expand all 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