Skip to content
GitLab
Commit ab5ef933 authored by Danny Auble's avatar Danny Auble
Browse files

Merge branch 'master' of http://github.com/chaos/slurm 

Conflicts:
	src/plugins/select/bluegene/ba_common.c
	src/plugins/select/bluegene/ba_common.h
parents 72f2a850 774fd4f9
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