Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

b9db189a

Commit b9db189a authored 9 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.11'

Conflicts:
	src/plugins/select/cons_res/job_test.c

parents 1ef5815f 22a0e5a5

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 1 addition, 0 deletions

NEWS
contribs/cray/Makefile.am 1 addition, 0 deletions

contribs/cray/Makefile.am
contribs/cray/Makefile.in 1 addition, 0 deletions

contribs/cray/Makefile.in
contribs/cray/plugstack.conf.template 7 additions, 0 deletions

contribs/cray/plugstack.conf.template
slurm.spec 3 additions, 0 deletions

slurm.spec
src/common/uid.c 3 additions, 3 deletions

src/common/uid.c
src/plugins/select/cons_res/job_test.c 24 additions, 24 deletions

src/plugins/select/cons_res/job_test.c

with 40 additions and 27 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