Merge branch 'slurm-15.08' (9cff9c93) · 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

9cff9c93

Commit 9cff9c93 authored 9 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-15.08'

Conflicts:
	src/slurmctld/job_mgr.c

parents 40a0b886 28b7f853

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 24 additions, 0 deletions

NEWS
contribs/torque/qstat.pl 1 addition, 1 deletion

contribs/torque/qstat.pl
doc/html/high_throughput.shtml 6 additions, 1 deletion

doc/html/high_throughput.shtml
doc/man/man1/squeue.1 10 additions, 4 deletions

doc/man/man1/squeue.1
src/common/slurm_protocol_defs.c 1 addition, 1 deletion

src/common/slurm_protocol_defs.c
src/common/xlua.c 10 additions, 24 deletions

src/common/xlua.c
src/slurmctld/job_mgr.c 6 additions, 2 deletions

src/slurmctld/job_mgr.c
src/slurmctld/proc_req.c 18 additions, 15 deletions

src/slurmctld/proc_req.c
src/slurmd/common/xcgroup.c 1 addition, 1 deletion

src/slurmd/common/xcgroup.c

with 77 additions and 49 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