Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

447061ef

Commit 447061ef authored 11 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.6'

Conflicts:
	META
	NEWS
	src/common/parse_time.c
	src/plugins/gres/mic/gres_mic.c
	src/slurmd/slurmd/slurmd.c
	testsuite/expect/test1.84

parents b9699c2f a3295afc

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 7 additions, 0 deletions

NEWS
doc/man/man1/srun.1 1 addition, 1 deletion

doc/man/man1/srun.1
src/common/slurm_acct_gather.c 10 additions, 3 deletions

src/common/slurm_acct_gather.c
src/common/slurm_acct_gather_profile.c 1 addition, 1 deletion

src/common/slurm_acct_gather_profile.c
src/common/slurm_errno.c 1 addition, 1 deletion

src/common/slurm_errno.c
src/plugins/gres/gpu/gres_gpu.c 3 additions, 4 deletions

src/plugins/gres/gpu/gres_gpu.c
src/plugins/gres/mic/gres_mic.c 297 additions, 298 deletions

src/plugins/gres/mic/gres_mic.c
src/slurmd/common/setproctitle.c 9 additions, 8 deletions

src/slurmd/common/setproctitle.c
src/slurmd/slurmd/slurmd.c 9 additions, 10 deletions

src/slurmd/slurmd/slurmd.c
testsuite/expect/test1.84 2 additions, 0 deletions

testsuite/expect/test1.84

with 340 additions and 326 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