Merge branch 'slurm-2.5' (e1d6ee3f) · 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

e1d6ee3f

Commit e1d6ee3f authored 12 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.5'

Conflicts:
	doc/html/documentation.shtml

parents 777bf478 3cec511a

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

NEWS
doc/html/Makefile.am 3 additions, 0 deletions

doc/html/Makefile.am
doc/html/Makefile.in 3 additions, 0 deletions

doc/html/Makefile.in
doc/html/documentation.shtml 2 additions, 1 deletion

doc/html/documentation.shtml
doc/html/rosetta.gif 0 additions, 0 deletions

doc/html/rosetta.gif
doc/html/rosetta.pdf 0 additions, 0 deletions

doc/html/rosetta.pdf
doc/html/rosetta.shtml 20 additions, 0 deletions

doc/html/rosetta.shtml
src/slurmctld/job_scheduler.c 4 additions, 2 deletions

src/slurmctld/job_scheduler.c

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