Merge remote-tracking branch 'origin/slurm-19.05' into slurm-20.02 (9647cff3) · 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

9647cff3

Commit 9647cff3 authored 4 years ago by Danny Auble

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/slurm-19.05' into slurm-20.02

# Conflicts:
#	src/plugins/select/cons_tres/select_cons_tres.c

parents ac3aaea3 0c0f30f2

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

src/plugins/select/cons_common/cons_common.c 2 additions, 0 deletions

src/plugins/select/cons_common/cons_common.c
src/plugins/select/cons_res/job_test.c 0 additions, 10 deletions

src/plugins/select/cons_res/job_test.c

with 2 additions and 10 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