Merge remote-tracking branch 'origin/slurm-16.05' into slurm-17.02 (426e9879) · 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

426e9879

Commit 426e9879 authored 8 years ago by Danny Auble

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/slurm-16.05' into slurm-17.02

parents 42c69718 595b24f1

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 3 additions, 2 deletions

NEWS
doc/html/power_save.shtml 2 additions, 1 deletion

doc/html/power_save.shtml
doc/man/man5/slurm.conf.5 3 additions, 0 deletions

doc/man/man5/slurm.conf.5
doc/man/man8/slurmd.8 2 additions, 2 deletions

doc/man/man8/slurmd.8
src/common/slurm_protocol_api.c 6 additions, 2 deletions

src/common/slurm_protocol_api.c
src/common/slurm_protocol_api.h 1 addition, 1 deletion

src/common/slurm_protocol_api.h
src/plugins/mpi/pmi2/setup.c 9 additions, 6 deletions

src/plugins/mpi/pmi2/setup.c
src/plugins/mpi/pmix/pmixp_agent.c 30 additions, 11 deletions

src/plugins/mpi/pmix/pmixp_agent.c
src/plugins/mpi/pmix/pmixp_client.c 2 additions, 2 deletions

src/plugins/mpi/pmix/pmixp_client.c
src/plugins/mpi/pmix/pmixp_info.c 12 additions, 4 deletions

src/plugins/mpi/pmix/pmixp_info.c
src/plugins/mpi/pmix/pmixp_info.h 5 additions, 3 deletions

src/plugins/mpi/pmix/pmixp_info.h
src/plugins/mpi/pmix/pmixp_utils.c 2 additions, 2 deletions

src/plugins/mpi/pmix/pmixp_utils.c
src/slurmd/slurmd/req.c 5 additions, 0 deletions

src/slurmd/slurmd/req.c

with 82 additions and 36 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