Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Slurm
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

d6700f9b

Commit d6700f9b authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03'

Conflicts:
	doc/html/gres.shtml
	src/slurmctld/slurmctld.h

parents c6828f2d c1f6b7b4

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 2 additions, 0 deletions

NEWS
auxdir/x_ac_lua.m4 1 addition, 1 deletion

auxdir/x_ac_lua.m4
configure 1 addition, 1 deletion

configure
contribs/lua/job_submit.license.lua 2 additions, 4 deletions

contribs/lua/job_submit.license.lua
doc/html/gres.shtml 5 additions, 0 deletions

doc/html/gres.shtml
src/plugins/job_submit/lua/job_submit_lua.c 3 additions, 1 deletion

src/plugins/job_submit/lua/job_submit_lua.c
src/slurmctld/job_mgr.c 8 additions, 9 deletions

src/slurmctld/job_mgr.c
src/slurmctld/slurmctld.h 26 additions, 23 deletions

src/slurmctld/slurmctld.h
src/slurmd/slurmstepd/slurmstepd_job.c 1 addition, 1 deletion

src/slurmd/slurmstepd/slurmstepd_job.c

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