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

Merge remote-tracking branch 'origin/slurm-2.6' 

Conflicts:
	doc/man/man5/cgroup.conf.5
	src/plugins/task/cgroup/task_cgroup_memory.c
parents 718d40df 9f15e67a
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