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

Merge branch 'slurm-14.11' 

Conflicts:
	doc/man/man1/squeue.1
	src/common/slurm_protocol_defs.c
parents da2a519c d4d51de7
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