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

Merge branch 'slurm-14.03' 

Conflicts:
	src/common/gres.c
parents 4f51799c 56211e07
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 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