Merge remote-tracking branch 'origin/slurm-17.02' (4fa4f65e) · 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

4fa4f65e

Commit 4fa4f65e authored 7 years ago by Danny Auble

Downloads
- Plain Diff

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

# Conflicts:
#	META
#	NEWS

parents c865bd0c d65ed698

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

NEWS 11 additions, 0 deletions

NEWS
src/common/msg_aggr.c 6 additions, 2 deletions

src/common/msg_aggr.c
src/common/slurm_selecttype_info.c 1 addition, 5 deletions

src/common/slurm_selecttype_info.c
src/slurmctld/acct_policy.c 7 additions, 0 deletions

src/slurmctld/acct_policy.c
src/slurmctld/job_mgr.c 32 additions, 17 deletions

src/slurmctld/job_mgr.c
src/slurmctld/licenses.c 4 additions, 1 deletion

src/slurmctld/licenses.c
src/slurmctld/node_scheduler.c 0 additions, 13 deletions

src/slurmctld/node_scheduler.c
src/slurmd/slurmd/req.c 6 additions, 1 deletion

src/slurmd/slurmd/req.c
testsuite/expect/test1.88 1 addition, 1 deletion

testsuite/expect/test1.88

with 68 additions and 40 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