Skip to content
Snippets Groups Projects
Commit b9cfdbe4 authored by Morris Jette's avatar Morris Jette
Browse files

Merge branch 'slurm-2.3'

Conflicts:
	META
	NEWS
	doc/html/team.shtml
	src/slurmctld/ping_nodes.c
parents ebbf58a5 48773c2e
No related branches found
No related tags found
No related merge requests found
...@@ -61,6 +61,9 @@ documents those changes that are of interest to users and admins. ...@@ -61,6 +61,9 @@ documents those changes that are of interest to users and admins.
-- If job time limit exceeds partition maximum, but job's minimum time limit -- If job time limit exceeds partition maximum, but job's minimum time limit
does not, set job's time limit to partition maximum at allocation time. does not, set job's time limit to partition maximum at allocation time.
* Changes in SLURM 2.3.2
========================
* Changes in SLURM 2.3.1 * Changes in SLURM 2.3.1
======================== ========================
-- Do not remove the backup slurmctld's pid file when it assumes control, only -- Do not remove the backup slurmctld's pid file when it assumes control, only
...@@ -119,6 +122,8 @@ documents those changes that are of interest to users and admins. ...@@ -119,6 +122,8 @@ documents those changes that are of interest to users and admins.
-- BLUEGENE - Fixed issues with running on a sub-midplane system. -- BLUEGENE - Fixed issues with running on a sub-midplane system.
-- Added some missing calls to allow older versions of SLURM to talk to newer. -- Added some missing calls to allow older versions of SLURM to talk to newer.
-- BGQ - allow steps to be ran. -- BGQ - allow steps to be ran.
-- Do not attempt to run HeathCheckProgram on powered down nodes. Patch from
Ramiro Alba, Centre Tecnològic de Tranferència de Calor, Spain.
* Changes in SLURM 2.3.0-2 * Changes in SLURM 2.3.0-2
========================== ==========================
......
...@@ -10,6 +10,7 @@ organizations. The current SLURM development staff includes: </p> ...@@ -10,6 +10,7 @@ organizations. The current SLURM development staff includes: </p>
<p> SLURM contributers include: </p> <p> SLURM contributers include: </p>
<ul> <ul>
<li>Ramiro Alba (Centre Tecnol&ograve;gic de Tranfer&egrave;ncia de Calor, Spain)</li>
<li>Amjad Majid Ali (Colorado State University)</li> <li>Amjad Majid Ali (Colorado State University)</li>
<li>P&auml;r Andersson (National Supercomputer Centre, Sweden)</li> <li>P&auml;r Andersson (National Supercomputer Centre, Sweden)</li>
<li>Don Albert (Bull)</li> <li>Don Albert (Bull)</li>
...@@ -61,8 +62,7 @@ organizations. The current SLURM development staff includes: </p> ...@@ -61,8 +62,7 @@ organizations. The current SLURM development staff includes: </p>
<li>Pere Munt (Barcelona Supercomputer Center, Spain)</li> <li>Pere Munt (Barcelona Supercomputer Center, Spain)</li>
<li>Michal Novotny (Masaryk University, Czech Republic)</li> <li>Michal Novotny (Masaryk University, Czech Republic)</li>
<li>Bryan O'Sullivan (Pathscale)</li> <li>Bryan O'Sullivan (Pathscale)</li>
<li>Gennaro Oliva (Institute of High Performance Computing and <li>Gennaro Oliva (Institute of High Performance Computing and Networking, Italy)</li>
Networking, Italy)</li>
<li>Alejandro Lucero Palau (Barcelona Supercomputer Center, Spain)</li> <li>Alejandro Lucero Palau (Barcelona Supercomputer Center, Spain)</li>
<li>Daniel Palermo (HP)</li> <li>Daniel Palermo (HP)</li>
<li>Dan Phung (LLNL/Columbia University)</li> <li>Dan Phung (LLNL/Columbia University)</li>
...@@ -94,6 +94,6 @@ organizations. The current SLURM development staff includes: </p> ...@@ -94,6 +94,6 @@ organizations. The current SLURM development staff includes: </p>
<li>Anne-Marie Wunderlin (Bull)</li> <li>Anne-Marie Wunderlin (Bull)</li>
</ul> </ul>
<p style="text-align:center;">Last modified 12 September 2011</p> <p style="text-align:center;">Last modified 24 October 2011</p>
<!--#include virtual="footer.txt"--> <!--#include virtual="footer.txt"-->
...@@ -363,8 +363,6 @@ extern void run_health_check(void) ...@@ -363,8 +363,6 @@ extern void run_health_check(void)
if (IS_NODE_NO_RESPOND(node_ptr) || IS_NODE_FUTURE(node_ptr) || if (IS_NODE_NO_RESPOND(node_ptr) || IS_NODE_FUTURE(node_ptr) ||
IS_NODE_POWER_SAVE(node_ptr)) IS_NODE_POWER_SAVE(node_ptr))
continue; continue;
if (IS_NODE_CLOUD(node_ptr) && IS_NODE_POWER_SAVE(node_ptr))
continue;
hostlist_push(check_agent_args->hostlist, node_ptr->name); hostlist_push(check_agent_args->hostlist, node_ptr->name);
check_agent_args->node_count++; check_agent_args->node_count++;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment