Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

43989247

Commit 43989247 authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/plugins/select/alps/cray_config.h

parents 92a69edd a9dc50d4

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

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

doc/man/man5/cray.conf.5
src/plugins/select/alps/basil_interface.c 95 additions, 20 deletions

src/plugins/select/alps/basil_interface.c
src/plugins/select/alps/cray_config.c 5 additions, 0 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

with 113 additions and 21 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