Merge remote-tracking branch 'origin/slurm-14.03' (92f18019) · 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

92f18019

Commit 92f18019 authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	testsuite/expect/test1.91

parents 27d7b556 fa73701e

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 5 additions, 0 deletions

NEWS
src/plugins/accounting_storage/mysql/as_mysql_archive.c 48 additions, 48 deletions

src/plugins/accounting_storage/mysql/as_mysql_archive.c
src/plugins/task/affinity/dist_tasks.c 28 additions, 14 deletions

src/plugins/task/affinity/dist_tasks.c
src/slurmctld/node_mgr.c 6 additions, 0 deletions

src/slurmctld/node_mgr.c
testsuite/expect/globals 31 additions, 0 deletions

testsuite/expect/globals
testsuite/expect/test1.91 5 additions, 1 deletion

testsuite/expect/test1.91

with 123 additions and 63 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