From d729c17f7b9f32cc87918211eca8b87353b427b1 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Thu, 15 Jun 2006 16:32:01 +0000
Subject: [PATCH] svn merge -r8405:8407
https://eris/svn/slurm/branches/slurm-1.1
---
NEWS | 5 +++++
src/scontrol/scontrol.c | 3 +++
2 files changed, 8 insertions(+)
diff --git a/NEWS b/NEWS
index 73ae39092c1..e2b7c5d216d 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,11 @@ documents those changes that are of interest to users and admins.
the code)
-- Added support for OSX build.
+* Changes in SLURM 1.1.3
+========================
+ -- Fix bug in scontrol show daemons if NodeName=localhost will work now to
+ display slurmd as place where it is running.
+
* Changes in SLURM 1.1.2
========================
-- Fix bug in jobcomp/filetxt plugin to report proper NodeCnt when a job
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index 9ba166a3d93..408f5f6c2ae 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -706,6 +706,9 @@ _print_daemons (void)
if ((n = slurm_conf_get_nodename(me))) {
d = 1;
xfree(n);
+ } else if ((n = slurm_conf_get_nodename("localhost"))) {
+ d = 1;
+ xfree(n);
}
strcpy(daemon_list, "");
--
GitLab