Skip to content
Snippets Groups Projects
Commit 494870df authored by Danny Auble's avatar Danny Auble
Browse files

Merge remote-tracking branch 'origin/slurm-2.4' 

Conflicts:
	src/plugins/launch/poe/Makefile.in
	src/plugins/launch/slurm/Makefile.in
	src/plugins/select/serial/Makefile.in
	testsuite/slurm_unit/common/Makefile.in
parents 64f52658 f6bede58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 803 additions and 404 deletions
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung