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

Merge branch 'nrt' of https://github.com/SchedMD/slurm into nrt 

Conflicts:
	configure
	configure.ac
	src/plugins/switch/Makefile.in
	src/plugins/switch/nrt/Makefile.in
parents 4068c091 953cbe62
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