Skip to content
Snippets Groups Projects
Commit 3a575902 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Merge branch 'slurm-15.08'

Conflicts:
	src/api/partition_info.c
parents 3d2b31db 581e811c
No related branches found
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment