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

c8495b78

Commit c8495b78 authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03'

Conflicts:
	src/common/assoc_mgr.c
	src/slurmctld/job_mgr.c

parents 2e41ae44 6b94b520

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 7 additions, 0 deletions

NEWS
src/common/assoc_mgr.c 13 additions, 12 deletions

src/common/assoc_mgr.c
src/common/assoc_mgr.h 12 additions, 1 deletion

src/common/assoc_mgr.h
src/slurmctld/acct_policy.c 1 addition, 1 deletion

src/slurmctld/acct_policy.c
src/slurmctld/controller.c 1 addition, 1 deletion

src/slurmctld/controller.c
src/slurmctld/job_mgr.c 15 additions, 14 deletions

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

src/slurmctld/job_scheduler.c
src/slurmctld/node_mgr.c 12 additions, 2 deletions

src/slurmctld/node_mgr.c
src/slurmctld/reservation.c 16 additions, 5 deletions

src/slurmctld/reservation.c
testsuite/expect/test1.59 8 additions, 8 deletions

testsuite/expect/test1.59

with 89 additions and 46 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