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

Merge branch 'slurm-2.6' of http://github.com/SchedMD/slurm into slurm-2.6

Conflicts:
	NEWS
parents dab7fb02 d710fc74
No related branches found
No related tags found
Loading
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