Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

f9e2e220

Commit f9e2e220 authored 11 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/slurmctld/job_scheduler.c

parents f123b6ef 0a0436d7

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 1 addition, 0 deletions

NEWS
src/plugins/select/cons_res/job_test.c 11 additions, 4 deletions

src/plugins/select/cons_res/job_test.c

with 12 additions and 4 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