Merge remote-tracking branch 'origin/slurm-2.4' (dc31fac5) · 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

dc31fac5

Commit dc31fac5 authored 12 years ago by Danny Auble

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/slurm-2.4'

Conflicts:
	src/srun/srun.c

parents 7d93afd2 0500e007

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

NEWS
src/plugins/launch/runjob/launch_runjob.c 6 additions, 0 deletions

src/plugins/launch/runjob/launch_runjob.c
src/slurmctld/srun_comm.c 27 additions, 16 deletions

src/slurmctld/srun_comm.c
src/slurmctld/srun_comm.h 7 additions, 0 deletions

src/slurmctld/srun_comm.h
src/slurmctld/step_mgr.c 20 additions, 0 deletions

src/slurmctld/step_mgr.c

with 62 additions and 16 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