Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

c496afc9

Commit c496afc9 authored 11 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.6'

Conflicts:
	testsuite/expect/test1.33

parents 24c564e2 a6d45691

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

doc/html/mpi_guide.shtml 7 additions, 3 deletions

doc/html/mpi_guide.shtml
doc/man/man5/acct_gather.conf.5 7 additions, 0 deletions

doc/man/man5/acct_gather.conf.5
src/common/slurm_acct_gather.c 6 additions, 2 deletions

src/common/slurm_acct_gather.c
testsuite/expect/test1.33 1 addition, 1 deletion

testsuite/expect/test1.33
testsuite/expect/test1.35 2 additions, 2 deletions

testsuite/expect/test1.35

with 23 additions and 8 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