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

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

Conflicts:
	src/plugins/task/cgroup/task_cgroup_devices.c
parents 5521917c 14656d16
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