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

Merge branch 'slurm-2.6' 

Conflicts:
	NEWS
	doc/man/man5/cgroup.conf.5
parents 3f4b2d51 6d1d932b
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