diff --git a/doc/html/gang_scheduling.shtml b/doc/html/gang_scheduling.shtml index d157fc5008bf583ac2fbee889f3ec638da430257..d1e1a30fc121976850db755b588b68186907a29e 100644 --- a/doc/html/gang_scheduling.shtml +++ b/doc/html/gang_scheduling.shtml @@ -40,9 +40,10 @@ gang scheduling: </P> <UL> <LI> -<B>SelectType</B>: The SLURM gang scheduler supports nodes -allocated by the <I>select/linear</I> plugin and socket/core/CPU resources -allocated by the <I>select/cons_res</I> plugin. +<B>SelectType</B>: The SLURM gang scheduler supports +nodes allocated by the <I>select/linear</I> plugin, +socket/core/CPU resources allocated by the <I>select/cons_res</I> plugin or +<I>select/cray</I> for Cray systems without ALPS. </LI> <LI> <B>SelectTypeParameter</B>: Since resources will be getting overallocated @@ -499,6 +500,6 @@ Note that <I>CR_Core_Memory</I> supports CPU binding, while <I>CR_CPU_Memory</I> does not. </P> -<p style="text-align:center;">Last modified 3 January 2014</p> +<p style="text-align:center;">Last modified 24 February 2014</p> <!--#include virtual="footer.txt"--> diff --git a/doc/html/preempt.shtml b/doc/html/preempt.shtml index 31c812119b3e8304414f6eb45e161bc54589c9af..a5aead552633a5a0a12e60dba8e2fab57ab272a5 100644 --- a/doc/html/preempt.shtml +++ b/doc/html/preempt.shtml @@ -28,9 +28,10 @@ There are several important configuration parameters relating to preemption: </P> <UL> <LI> -<B>SelectType</B>: SLURM job preemption logic supports nodes allocated by the -<I>select/linear</I> plugin and socket/core/CPU resources allocated by the -<I>select/cons_res</I> plugin. +<B>SelectType</B>: SLURM job preemption logic supports +nodes allocated by the <I>select/linear</I> plugin, +socket/core/CPU resources allocated by the <I>select/cons_res</I> plugin or +<I>select/cray</I> for Cray systems without ALPS. </LI> <LI> <B>SelectTypeParameter</B>: Since resources may be getting over-allocated @@ -373,6 +374,6 @@ order to support ideal placements such as this, which can quickly complicate the design. Any and all help is welcome here! </P> -<p style="text-align:center;">Last modified 17 July 2013</p> +<p style="text-align:center;">Last modified 24 February 2014</p> <!--#include virtual="footer.txt"-->