Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

c38154e8

Commit c38154e8 authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.11'

Conflicts:
	slurm.spec

parents 29be4f4f 84e88913

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 3 additions, 0 deletions

NEWS
doc/html/meetings.shtml 3 additions, 3 deletions

doc/html/meetings.shtml
doc/html/slurm_ug_cfp.shtml 15 additions, 14 deletions

doc/html/slurm_ug_cfp.shtml
doc/man/man5/slurm.conf.5 11 additions, 8 deletions

doc/man/man5/slurm.conf.5
src/api/allocate.c 6 additions, 0 deletions

src/api/allocate.c
src/slurmctld/job_mgr.c 30 additions, 40 deletions

src/slurmctld/job_mgr.c
src/srun/libsrun/allocate.c 6 additions, 0 deletions

src/srun/libsrun/allocate.c

with 74 additions and 65 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