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

Merge branch 'slurm-14.11'

Conflicts:
	testsuite/expect/test12.7
parents 3b2243fc 9b7a3527
No related branches found
No related tags found
Loading
Showing
with 20 additions and 20 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