Merge branch 'slurm-2.4' (d4281c6a) · 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

d4281c6a

Commit d4281c6a authored 12 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.4'

Conflicts:
	doc/html/high_throughput.shtml

parents 1e563165 46a3767e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 4 additions, 0 deletions

NEWS
doc/html/high_throughput.shtml 20 additions, 2 deletions

doc/html/high_throughput.shtml
src/plugins/select/bluegene/ba_bgq/block_allocator.c 2 additions, 10 deletions

src/plugins/select/bluegene/ba_bgq/block_allocator.c
src/plugins/select/bluegene/select_bluegene.c 42 additions, 9 deletions

src/plugins/select/bluegene/select_bluegene.c
src/slurmctld/step_mgr.c 0 additions, 7 deletions

src/slurmctld/step_mgr.c
src/slurmd/slurmd/req.c 1 addition, 1 deletion

src/slurmd/slurmd/req.c

with 69 additions and 29 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