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

d30ab201

Commit d30ab201 authored 5 years ago by Danny Auble

Downloads
- Plain Diff

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

# Conflicts:
#	doc/man/man5/slurm.conf.5
#	doc/man/man5/slurmdbd.conf.5

parents f9f78f8e 63ac136a

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 12 additions, 0 deletions

NEWS
doc/man/man5/slurm.conf.5 14 additions, 1 deletion

doc/man/man5/slurm.conf.5
doc/man/man5/slurmdbd.conf.5 2 additions, 2 deletions

doc/man/man5/slurmdbd.conf.5
src/plugins/accounting_storage/mysql/as_mysql_cluster.c 3 additions, 0 deletions

src/plugins/accounting_storage/mysql/as_mysql_cluster.c
src/slurmctld/controller.c 4 additions, 0 deletions

src/slurmctld/controller.c
src/slurmctld/job_scheduler.c 7 additions, 1 deletion

src/slurmctld/job_scheduler.c
src/slurmctld/node_mgr.c 11 additions, 7 deletions

src/slurmctld/node_mgr.c
src/slurmctld/proc_req.c 1 addition, 0 deletions

src/slurmctld/proc_req.c

with 54 additions and 11 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