Skip to content
Snippets Groups Projects
Commit 845e8ab9 authored by Danny Auble's avatar Danny Auble
Browse files

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

Conflicts:
	src/slurmd/slurmstepd/slurmstepd_job.c
parents 4b37fb39 17e4e2ac
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
NEWS
+ 1
− 0
View file @ 845e8ab9
...@@ -422,6 +422,7 @@ documents those changes that are of interest to users and admins. ...@@ -422,6 +422,7 @@ documents those changes that are of interest to users and admins.
-- Switch/nrt - On switch resource allocation failure, free partial allocation. -- Switch/nrt - On switch resource allocation failure, free partial allocation.
-- Switch/nrt - Properly track usage of CAU and RDMA resources with multiple -- Switch/nrt - Properly track usage of CAU and RDMA resources with multiple
tasks per compute node. tasks per compute node.
-- Fix issue where user is requesting --acctg-freq=0 and no memory limits.
* Changes in Slurm 2.6.9 * Changes in Slurm 2.6.9
======================== ========================
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung