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

23273823

Commit 23273823 authored 11 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.6'

Conflicts:
	src/slurmctld/job_mgr.c

parents 3fa17bfa 65d9196c

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

NEWS
doc/html/quickstart_admin.shtml 1 addition, 1 deletion

doc/html/quickstart_admin.shtml
doc/html/troubleshoot.shtml 10 additions, 5 deletions

doc/html/troubleshoot.shtml
doc/man/man1/scontrol.1 1 addition, 0 deletions

doc/man/man1/scontrol.1
src/slurmctld/job_mgr.c 9 additions, 1 deletion

src/slurmctld/job_mgr.c

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