Merge branch 'slurm-14.03' (f415652b) · 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

f415652b

Commit f415652b authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03'

Conflicts:
	configure
	contribs/cray/Makefile.in
	src/common/stepd_api.c

parents 37f63959 6bb05483

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 5 additions, 0 deletions

NEWS
aclocal.m4 1 addition, 1 deletion

aclocal.m4
contribs/cray/Makefile.am 1 addition, 1 deletion

contribs/cray/Makefile.am
contribs/cray/Makefile.in 0 additions, 1 deletion

contribs/cray/Makefile.in
src/common/stepd_api.c 4 additions, 3 deletions

src/common/stepd_api.c
src/slurmctld/job_mgr.c 11 additions, 1 deletion

src/slurmctld/job_mgr.c
src/slurmctld/node_mgr.c 7 additions, 0 deletions

src/slurmctld/node_mgr.c
src/slurmd/slurmstepd/mgr.c 2 additions, 0 deletions

src/slurmd/slurmstepd/mgr.c
src/slurmd/slurmstepd/slurmstepd.c 3 additions, 3 deletions

src/slurmd/slurmstepd/slurmstepd.c

with 34 additions and 10 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