Skip to content
GitLab
Commit aa427778 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.6' 

Conflicts:
	NEWS
	src/common/gres.h
	src/slurmctld/node_scheduler.c
parents b0eb46c0 d704c747
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