Merge remote-tracking branch 'origin/slurm-14.03' (56951ca8) · 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

56951ca8

Commit 56951ca8 authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/slurmctld/job_mgr.c

parents 53a657d5 2532fc15

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 10 additions, 2 deletions

NEWS
src/slurmctld/job_mgr.c 7 additions, 8 deletions

src/slurmctld/job_mgr.c
src/slurmctld/proc_req.c 7 additions, 2 deletions

src/slurmctld/proc_req.c
testsuite/expect/test4.5 6 additions, 4 deletions

testsuite/expect/test4.5

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