Merge remote-tracking branch 'origin/slurm-14.11' (8621da6a) · 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

8621da6a

Commit 8621da6a authored 9 years ago by Brian Christiansen

Downloads
- Plain Diff

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

Conflicts:
	config.h.in
	src/sreport/job_reports.c

parents 488c8e87 3227b364

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 7 additions, 0 deletions

NEWS
auxdir/x_ac_cray.m4 7 additions, 3 deletions

auxdir/x_ac_cray.m4
config.h.in 0 additions, 6 deletions

config.h.in
configure 7 additions, 13 deletions

configure
src/plugins/select/linear/select_linear.c 6 additions, 6 deletions

src/plugins/select/linear/select_linear.c
src/slurmctld/job_scheduler.c 16 additions, 1 deletion

src/slurmctld/job_scheduler.c
src/sreport/job_reports.c 1 addition, 0 deletions

src/sreport/job_reports.c
src/srun/libsrun/Makefile.am 4 additions, 2 deletions

src/srun/libsrun/Makefile.am
src/srun/libsrun/Makefile.in 6 additions, 2 deletions

src/srun/libsrun/Makefile.in

with 54 additions and 33 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