Skip to content
GitLab
Commit 4226fddc authored by Moe Jette's avatar Moe Jette
Browse files

Merge branch 'slurm-2.2' 

Conflicts:
	src/slurmctld/node_mgr.c
	src/slurmctld/node_scheduler.c
parents 34fe56a2 e9c7e7d9
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