Merge branch 'slurm-14.03' into slurm-14.11 (391fc2c9) · 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

391fc2c9

Commit 391fc2c9 authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03' into slurm-14.11

Conflicts:
	src/slurmd/slurmstepd/task.c
	src/squeue/print.c

parents 717c9ec5 836f7256

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

src/slurmctld/licenses.c 5 additions, 5 deletions

src/slurmctld/licenses.c
src/slurmctld/read_config.c 1 addition, 1 deletion

src/slurmctld/read_config.c
src/slurmctld/reservation.c 2 additions, 2 deletions

src/slurmctld/reservation.c

with 8 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