Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

3e75f76e

Commit 3e75f76e authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/slurmctld/job_mgr.c
	testsuite/expect/test1.97

parents a59e0163 84807b11

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 1 addition, 0 deletions

NEWS
src/plugins/select/cons_res/select_cons_res.c 2 additions, 2 deletions

src/plugins/select/cons_res/select_cons_res.c
src/slurmctld/job_mgr.c 1 addition, 1 deletion

src/slurmctld/job_mgr.c
testsuite/expect/test1.97 1 addition, 0 deletions

testsuite/expect/test1.97

with 5 additions and 3 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