Merge remote-tracking branch 'origin/slurm-2.6' (62bb8f03) · 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

62bb8f03

Commit 62bb8f03 authored 11 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	src/common/slurmdb_defs.c

parents da910f23 d0069537

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 1 addition, 0 deletions

NEWS
src/common/slurmdb_defs.c 2 additions, 2 deletions

src/common/slurmdb_defs.c
src/squeue/opts.c 1 addition, 1 deletion

src/squeue/opts.c
src/squeue/squeue.c 1 addition, 1 deletion

src/squeue/squeue.c
testsuite/expect/test24.1.prog.c 17 additions, 17 deletions

testsuite/expect/test24.1.prog.c

with 22 additions and 21 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