Merge branch 'slurm-2.6' (43d74205) · Commits · tud-zih-energy / Slurm · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Slurm
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

43d74205

Commit 43d74205 authored 11 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.6'

Conflicts:
	doc/man/man5/slurm.conf.5
	testsuite/expect/test1.89
	testsuite/expect/test1.90

parents 7661aa0d e1dc6635

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 6 additions, 1 deletion

NEWS
doc/man/man5/slurm.conf.5 14 additions, 1 deletion

doc/man/man5/slurm.conf.5
src/common/slurm_resource_info.c 6 additions, 0 deletions

src/common/slurm_resource_info.c
src/plugins/mpi/pmi2/spawn.c 6 additions, 6 deletions

src/plugins/mpi/pmi2/spawn.c
src/plugins/sched/backfill/backfill.c 13 additions, 0 deletions

src/plugins/sched/backfill/backfill.c
src/slurmd/slurmd/slurmd.c 5 additions, 5 deletions

src/slurmd/slurmd/slurmd.c
testsuite/expect/test1.89 1 addition, 0 deletions

testsuite/expect/test1.89
testsuite/expect/test1.90 1 addition, 0 deletions

testsuite/expect/test1.90

with 52 additions and 13 deletions

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 sign in to comment

Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung