Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

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

Snippets Groups Projects

0103bc23

Commit 0103bc23 authored 10 years ago by Danny Auble

Downloads
- Plain Diff

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

Conflicts:
	contribs/perlapi/libslurm/perl/typemap
	src/slurmctld/acct_policy.c

parents c1f6b7b4 935432ad

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 5 additions, 0 deletions

NEWS
contribs/perlapi/libslurm/perl/classmap 1 addition, 1 deletion

contribs/perlapi/libslurm/perl/classmap
contribs/perlapi/libslurm/perl/typemap 4 additions, 3 deletions

contribs/perlapi/libslurm/perl/typemap
src/plugins/select/bluegene/bg_job_place.c 0 additions, 44 deletions

src/plugins/select/bluegene/bg_job_place.c
src/plugins/select/bluegene/bg_job_run.c 45 additions, 22 deletions

src/plugins/select/bluegene/bg_job_run.c
src/slurmctld/acct_policy.c 5 additions, 5 deletions

src/slurmctld/acct_policy.c
src/slurmctld/node_scheduler.c 19 additions, 1 deletion

src/slurmctld/node_scheduler.c

with 79 additions and 76 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