Merge branch 'slurm-15.08' (509fc801) · 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

509fc801

"README.rst" did not exist on "9d396fae87e4f7772c97d2d03d510a00b0c2ab88"

Commit 509fc801 authored 9 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-15.08'

Conflicts:
	META
	NEWS

parents 092d9173 8c3fcb09

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 4 additions, 0 deletions

NEWS
doc/html/priority_multifactor.shtml 1 addition, 1 deletion

doc/html/priority_multifactor.shtml
doc/html/tres.shtml 15 additions, 6 deletions

doc/html/tres.shtml
doc/man/man5/slurm.conf.5 12 additions, 6 deletions

doc/man/man5/slurm.conf.5
src/common/slurm_protocol_api.c 51 additions, 5 deletions

src/common/slurm_protocol_api.c
src/common/slurm_protocol_api.h 1 addition, 0 deletions

src/common/slurm_protocol_api.h
src/plugins/priority/multifactor/priority_multifactor.c 2 additions, 7 deletions

src/plugins/priority/multifactor/priority_multifactor.c
testsuite/expect/test1.91 3 additions, 0 deletions

testsuite/expect/test1.91
testsuite/expect/test2.21 2 additions, 2 deletions

testsuite/expect/test2.21
testsuite/expect/test2.22 1 addition, 1 deletion

testsuite/expect/test2.22

with 92 additions and 28 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