Merge branch 'slurm-14.11' into slurm-15.08 (68496788) · 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

Admin message

An update will be installed on Tuesday, April 15, 2025 between 21:00 and 22:00. During this, the service will be unavailable several times.

68496788

Commit 68496788 authored 9 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.11' into slurm-15.08

Conflicts:
	src/slurmctld/job_mgr.c

parents f2311361 74184e4d

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/slurmctld/job_mgr.c 6 additions, 1 deletion

src/slurmctld/job_mgr.c
src/slurmctld/job_scheduler.c 2 additions, 0 deletions

src/slurmctld/job_scheduler.c
src/slurmctld/slurmctld.h 4 additions, 0 deletions

src/slurmctld/slurmctld.h
src/slurmd/slurmstepd/req.c 13 additions, 12 deletions

src/slurmd/slurmstepd/req.c

with 25 additions and 13 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