Merge branch 'slurm-15.08' (3a575902) · 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

3a575902

Commit 3a575902 authored 9 years ago by Tim Wickberg

Downloads
- Plain Diff

Merge branch 'slurm-15.08'

Conflicts:
	src/api/partition_info.c

parents 3d2b31db 581e811c

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 5 additions, 0 deletions

NEWS
src/api/partition_info.c 105 additions, 173 deletions

src/api/partition_info.c
src/api/reservation_info.c 21 additions, 35 deletions

src/api/reservation_info.c
src/common/hostlist.h 0 additions, 3 deletions

src/common/hostlist.h
src/slurmctld/reservation.c 9 additions, 4 deletions

src/slurmctld/reservation.c

with 140 additions and 215 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