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

6b3c5ee9

Commit 6b3c5ee9 authored 11 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.6'

Conflicts:
	src/common/env.c

parents f2865a61 ca049f08

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 6 additions, 0 deletions

NEWS
contribs/torque/Makefile.am 3 additions, 1 deletion

contribs/torque/Makefile.am
contribs/torque/Makefile.in 3 additions, 1 deletion

contribs/torque/Makefile.in
contribs/torque/qalter.pl 232 additions, 0 deletions

contribs/torque/qalter.pl
contribs/torque/qrerun.pl 134 additions, 0 deletions

contribs/torque/qrerun.pl
contribs/torque/qstat.pl 4 additions, 4 deletions

contribs/torque/qstat.pl
doc/html/team.shtml 5 additions, 1 deletion

doc/html/team.shtml
slurm.spec 2 additions, 0 deletions

slurm.spec
src/common/env.c 29 additions, 22 deletions

src/common/env.c

with 418 additions and 29 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