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

1ce60c71

Commit 1ce60c71 authored 9 years ago by Brian Christiansen

Downloads
- Plain Diff

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

Conflicts:
	src/common/slurm_protocol_defs.c

parents db78cc41 dbf21749

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 3 additions, 0 deletions

NEWS
doc/man/man5/slurm.conf.5 1 addition, 2 deletions

doc/man/man5/slurm.conf.5
src/common/node_conf.c 1 addition, 0 deletions

src/common/node_conf.c
src/common/slurm_protocol_api.c 3 additions, 1 deletion

src/common/slurm_protocol_api.c
src/common/slurm_protocol_defs.c 7 additions, 0 deletions

src/common/slurm_protocol_defs.c
src/common/xhash.c 4 additions, 4 deletions

src/common/xhash.c
src/common/xhash.h 3 additions, 1 deletion

src/common/xhash.h
src/plugins/select/cray/select_cray.c 53 additions, 7 deletions

src/plugins/select/cray/select_cray.c
src/slurmctld/backup.c 1 addition, 0 deletions

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

src/slurmctld/node_mgr.c
src/slurmctld/read_config.c 1 addition, 2 deletions

src/slurmctld/read_config.c

with 78 additions and 18 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