Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Slurm
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

efe8ae36

Commit efe8ae36 authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/slurmctld/acct_policy.c

parents 52f79715 319be552

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 1 deletion

NEWS
src/plugins/priority/basic/priority_basic.c 1 addition, 1 deletion

src/plugins/priority/basic/priority_basic.c
src/plugins/priority/multifactor/fair_tree.c 1 addition, 1 deletion

src/plugins/priority/multifactor/fair_tree.c
src/plugins/priority/multifactor/priority_multifactor.c 8 additions, 8 deletions

src/plugins/priority/multifactor/priority_multifactor.c
src/slurmctld/acct_policy.c 5 additions, 5 deletions

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

src/slurmctld/job_mgr.c

with 18 additions and 17 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