Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

e189b1c6

Commit e189b1c6 authored 12 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.4'

Conflicts:
	src/srun/srun_job.c

parents 779a6e06 a5431885

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

doc/man/man1/salloc.1 6 additions, 1 deletion

doc/man/man1/salloc.1
doc/man/man1/sbatch.1 6 additions, 1 deletion

doc/man/man1/sbatch.1
doc/man/man1/srun.1 6 additions, 1 deletion

doc/man/man1/srun.1
src/slurmctld/job_mgr.c 0 additions, 2 deletions

src/slurmctld/job_mgr.c
src/slurmctld/node_scheduler.c 8 additions, 7 deletions

src/slurmctld/node_scheduler.c

with 26 additions and 12 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