Merge branch 'slurm-14.03' (a2731fe6) · 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

a2731fe6

Commit a2731fe6 authored 10 years ago by Morris Jette

Downloads
- Plain Diff

Merge branch 'slurm-14.03'

Conflicts:
	src/slurmctld/job_mgr.c

parents 897fb2cb 176a8b67

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 11 additions, 4 deletions

NEWS
doc/html/slurm_ug_agenda.shtml 12 additions, 12 deletions

doc/html/slurm_ug_agenda.shtml
doc/man/man1/salloc.1 3 additions, 0 deletions

doc/man/man1/salloc.1
doc/man/man1/sbatch.1 3 additions, 0 deletions

doc/man/man1/sbatch.1
doc/man/man1/srun.1 3 additions, 0 deletions

doc/man/man1/srun.1
src/plugins/sched/backfill/backfill.c 2 additions, 9 deletions

src/plugins/sched/backfill/backfill.c
src/plugins/task/cgroup/task_cgroup_cpuset.c 5 additions, 2 deletions

src/plugins/task/cgroup/task_cgroup_cpuset.c
src/slurmctld/controller.c 3 additions, 11 deletions

src/slurmctld/controller.c
src/slurmctld/job_mgr.c 22 additions, 15 deletions

src/slurmctld/job_mgr.c
src/slurmctld/statistics.c 2 additions, 0 deletions

src/slurmctld/statistics.c

with 66 additions and 53 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