Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

5f805f21

Commit 5f805f21 authored 11 years ago by Danny Auble

Downloads
- Plain Diff

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

parents 61df3f9f f98413b1

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 3 additions, 0 deletions

NEWS
doc/man/man5/cray.conf.5 6 additions, 1 deletion

doc/man/man5/cray.conf.5
src/api/node_info.c 7 additions, 4 deletions

src/api/node_info.c
src/common/xcpuinfo.c 17 additions, 2 deletions

src/common/xcpuinfo.c
src/plugins/select/alps/basil_interface.h 4 additions, 0 deletions

src/plugins/select/alps/basil_interface.h
src/plugins/select/alps/cray_config.c 24 additions, 19 deletions

src/plugins/select/alps/cray_config.c
src/plugins/select/alps/cray_config.h 4 additions, 0 deletions

src/plugins/select/alps/cray_config.h
src/plugins/select/alps/libalps/basil_request.c 55 additions, 0 deletions

src/plugins/select/alps/libalps/basil_request.c
src/slurmd/slurmstepd/mgr.c 10 additions, 5 deletions

src/slurmd/slurmstepd/mgr.c

with 130 additions and 31 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