Skip to content
Snippets Groups Projects
Commit 70ca95a6 authored by jette's avatar jette
Browse files

Merge branch 'slurm-14.03'

Conflicts:
	src/plugins/select/cons_res/job_test.c
parents f370ddd7 90f1727d
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment