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

2e41ae44

Commit 2e41ae44 authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03'

Conflicts:
	doc/html/faq.shtml

parents 943a2975 1cfe929b

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

NEWS
doc/html/faq.shtml 36 additions, 45 deletions

doc/html/faq.shtml
doc/html/team.shtml 1 addition, 0 deletions

doc/html/team.shtml
doc/man/man1/sacct.1 22 additions, 26 deletions

doc/man/man1/sacct.1
doc/man/man1/scontrol.1 5 additions, 4 deletions

doc/man/man1/scontrol.1
doc/man/man1/sinfo.1 5 additions, 4 deletions

doc/man/man1/sinfo.1
doc/man/man1/squeue.1 5 additions, 4 deletions

doc/man/man1/squeue.1
src/plugins/select/alps/Makefile.am 4 additions, 2 deletions

src/plugins/select/alps/Makefile.am
src/plugins/select/alps/Makefile.in 7 additions, 9 deletions

src/plugins/select/alps/Makefile.in

with 87 additions and 94 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