Skip to content
GitLab
Commit 447061ef authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.6' 

Conflicts:
	META
	NEWS
	src/common/parse_time.c
	src/plugins/gres/mic/gres_mic.c
	src/slurmd/slurmd/slurmd.c
	testsuite/expect/test1.84
parents b9699c2f a3295afc
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