Merge remote-tracking branch 'origin/slurm-14.11' (ebbb330c) · 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

ebbb330c

Commit ebbb330c authored 9 years ago by Danny Auble

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/slurm-14.11'

Conflicts:
	src/plugins/accounting_storage/mysql/as_mysql_job.c

parents 2475d7b7 0896ca06

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 3 additions, 0 deletions

NEWS
src/common/env.c 9 additions, 0 deletions

src/common/env.c
src/common/env.h 1 addition, 0 deletions

src/common/env.h
src/plugins/accounting_storage/mysql/as_mysql_job.c 17 additions, 11 deletions

src/plugins/accounting_storage/mysql/as_mysql_job.c
src/sbatch/opt.c 1 addition, 0 deletions

src/sbatch/opt.c
src/srun/srun.c 2 additions, 0 deletions

src/srun/srun.c

with 33 additions and 11 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