Merge branch 'slurm-2.6' (334a663b) · 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

334a663b

Commit 334a663b authored 11 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.6'

Conflicts:
	src/slurmd/slurmstepd/req.c

parents 3fa1b963 0acd414e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

doc/html/preempt.shtml 5 additions, 24 deletions

doc/html/preempt.shtml
src/common/slurm_protocol_defs.h 2 additions, 1 deletion

src/common/slurm_protocol_defs.h
src/slurmd/slurmstepd/req.c 9 additions, 15 deletions

src/slurmd/slurmstepd/req.c
testsuite/expect/test3.7 4 additions, 2 deletions

testsuite/expect/test3.7

with 20 additions and 42 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