Merge branch 'slurm-2.2' (4226fddc) · 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

4226fddc

Commit 4226fddc authored 13 years ago by Moe Jette

Downloads
- Plain Diff

Merge branch 'slurm-2.2'

Conflicts:
	src/slurmctld/node_mgr.c
	src/slurmctld/node_scheduler.c

parents 34fe56a2 e9c7e7d9

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 4 additions, 0 deletions

NEWS
src/common/assoc_mgr.c 5 additions, 3 deletions

src/common/assoc_mgr.c
src/slurmctld/node_mgr.c 21 additions, 21 deletions

src/slurmctld/node_mgr.c
src/slurmctld/node_scheduler.c 1 addition, 1 deletion

src/slurmctld/node_scheduler.c
src/slurmctld/power_save.c 10 additions, 7 deletions

src/slurmctld/power_save.c

with 41 additions and 32 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