Merge remote-tracking branch 'origin/slurm-2.5' (7b46b4c4) · 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

7b46b4c4

Commit 7b46b4c4 authored 12 years ago by Danny Auble

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/slurm-2.5'

Conflicts:
	contribs/perlapi/libslurm/perl/step_ctx.c

parents f83df879 73d46476

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 5 additions, 0 deletions

NEWS
contribs/perlapi/libslurm/perl/alloc.c 18 additions, 17 deletions

contribs/perlapi/libslurm/perl/alloc.c
contribs/perlapi/libslurm/perl/slurm-perl.h 3 additions, 0 deletions

contribs/perlapi/libslurm/perl/slurm-perl.h
contribs/perlapi/libslurm/perl/step_ctx.c 77 additions, 3 deletions

contribs/perlapi/libslurm/perl/step_ctx.c
doc/html/faq.shtml 1 addition, 1 deletion

doc/html/faq.shtml
src/plugins/select/bluegene/bg_job_place.c 5 additions, 1 deletion

src/plugins/select/bluegene/bg_job_place.c
src/slurmctld/step_mgr.c 3 additions, 1 deletion

src/slurmctld/step_mgr.c

with 112 additions and 23 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