Merge remote-tracking branch 'origin/slurm-14.11' (b6b3d6a6) · 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

b6b3d6a6

Commit b6b3d6a6 authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/plugins/priority/multifactor/fair_tree.c

parents 64d0fa18 5b61a0dd

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, 0 deletions

NEWS
doc/man/man5/slurm.conf.5 11 additions, 4 deletions

doc/man/man5/slurm.conf.5
src/common/slurm_protocol_defs.c 6 additions, 10 deletions

src/common/slurm_protocol_defs.c
src/plugins/priority/multifactor/fair_tree.c 82 additions, 38 deletions

src/plugins/priority/multifactor/fair_tree.c
src/plugins/select/cons_res/dist_tasks.c 0 additions, 8 deletions

src/plugins/select/cons_res/dist_tasks.c
testsuite/expect/test24.4 1 addition, 1 deletion

testsuite/expect/test24.4

with 102 additions and 61 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