Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

a6ae543c

Commit a6ae543c authored 9 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-15.08'

Conflicts:
	slurm.spec

parents c97e08a0 b1fda7c6

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 4 additions, 0 deletions

NEWS
doc/html/cray.shtml 9 additions, 1 deletion

doc/html/cray.shtml
doc/html/meetings.shtml 12 additions, 7 deletions

doc/html/meetings.shtml
doc/man/man5/slurm.conf.5 28 additions, 2 deletions

doc/man/man5/slurm.conf.5
src/common/slurmdbd_defs.c 1 addition, 1 deletion

src/common/slurmdbd_defs.c
src/common/xtree.c 2 additions, 2 deletions

src/common/xtree.c
src/plugins/burst_buffer/cray/burst_buffer_cray.c 7 additions, 3 deletions

src/plugins/burst_buffer/cray/burst_buffer_cray.c
src/plugins/select/cray/select_cray.c 12 additions, 0 deletions

src/plugins/select/cray/select_cray.c
src/plugins/task/affinity/dist_tasks.c 9 additions, 2 deletions

src/plugins/task/affinity/dist_tasks.c
src/slurmctld/agent.c 2 additions, 2 deletions

src/slurmctld/agent.c
src/slurmctld/job_mgr.c 2 additions, 2 deletions

src/slurmctld/job_mgr.c
src/slurmctld/job_scheduler.c 2 additions, 1 deletion

src/slurmctld/job_scheduler.c
src/slurmctld/node_scheduler.c 25 additions, 25 deletions

src/slurmctld/node_scheduler.c

with 115 additions and 48 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