Skip to content
Snippets Groups Projects
Commit c407fb5c authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-14.11' 

Conflicts:
	doc/man/man1/sbatch.1
	src/slurmctld/job_scheduler.c
parents 75f054a8 dd6d5ddc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 135 additions and 42 deletions
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung