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

Merge branch 'slurm-2.3' into slurm-2.4 

Conflicts:
	src/slurmctld/reservation.c
parents 19cee1a8 f212ba3c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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