Merge remote-tracking branch 'origin/slurm-2.3' (38cdabaa) · 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

38cdabaa

Commit 38cdabaa authored 13 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/slurmctld/job_mgr.c

parents 92a3c085 1cb9dabd

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 4 additions, 0 deletions

NEWS
src/common/assoc_mgr.c 5 additions, 2 deletions

src/common/assoc_mgr.c
src/plugins/accounting_storage/slurmdbd/accounting_storage_slurmdbd.c 10 additions, 3 deletions

...accounting_storage/slurmdbd/accounting_storage_slurmdbd.c
src/slurmctld/job_mgr.c 9 additions, 3 deletions

src/slurmctld/job_mgr.c

with 28 additions and 8 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