Skip to content
Snippets Groups Projects
Commit cad4c6a9 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.6'

Conflicts:
	src/common/plugstack.c
parents 75ef81d5 caa69594
No related branches found
No related tags found
No related merge requests found
Showing
with 117 additions and 63 deletions
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