Merge branch 'slurm-14.03' (14d6e267) · 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

14d6e267

Commit 14d6e267 authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03'

Conflicts:
	src/slurmd/slurmd/slurmd.c

parents c42bb7fd 967e11d5

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

src/common/plugstack.c 1 addition, 1 deletion

src/common/plugstack.c
src/slurmd/slurmd/req.c 20 additions, 14 deletions

src/slurmd/slurmd/req.c
src/slurmd/slurmd/slurmd.c 3 additions, 0 deletions

src/slurmd/slurmd/slurmd.c
src/slurmd/slurmd/slurmd.h 3 additions, 0 deletions

src/slurmd/slurmd/slurmd.h
src/slurmd/slurmstepd/slurmstepd.c 2 additions, 2 deletions

src/slurmd/slurmstepd/slurmstepd.c

with 29 additions and 17 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