Merge branch 'slurm-14.11' (821c8bb8) · 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

821c8bb8

Commit 821c8bb8 authored 9 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.11'

Conflicts:
	slurm/slurm.h.in
	src/slurmctld/job_scheduler.c
	src/slurmd/slurmstepd/task.c

parents 6c425ca9 18bbf378

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

slurm/slurm.h.in 1 addition, 1 deletion

slurm/slurm.h.in
src/slurmctld/job_scheduler.c 13 additions, 4 deletions

src/slurmctld/job_scheduler.c
src/slurmctld/proc_req.c 6 additions, 2 deletions

src/slurmctld/proc_req.c
src/slurmd/slurmstepd/mgr.c 1 addition, 1 deletion

src/slurmd/slurmstepd/mgr.c
src/slurmd/slurmstepd/task.c 2 additions, 2 deletions

src/slurmd/slurmstepd/task.c

with 23 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