From 4e8c184e54b6ddcb41ea18db811ab2b869a6aec0 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 19 Jan 2007 19:46:13 +0000
Subject: [PATCH] svn merge -r10808:10811
 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

---
 NEWS                                | 1 +
 src/plugins/sched/wiki2/get_nodes.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 44729fab088..7f3b468af04 100644
--- a/NEWS
+++ b/NEWS
@@ -210,6 +210,7 @@ documents those changes that are of interest to users and admins.
  - Fix for running a task on each node of an allocation if not specified.
  - In sched/wiki2, set TASKLIST for running jobs.
  - In sched/wiki2, set STARTDATE for pending jobs with deferred start.
+ - Added srun --get-user-env option (for Moab scheduler).
 
 * Changes in SLURM 1.1.24
 =========================
diff --git a/src/plugins/sched/wiki2/get_nodes.c b/src/plugins/sched/wiki2/get_nodes.c
index 3c9b9ebcbce..4c098430cf7 100644
--- a/src/plugins/sched/wiki2/get_nodes.c
+++ b/src/plugins/sched/wiki2/get_nodes.c
@@ -177,7 +177,6 @@ static char *	_dump_node(struct node_record *node_ptr, int state_info)
 		cpu_cnt = node_ptr->cpus;
 	}
 	for (i=0; i<node_ptr->part_cnt; i++) {
-		char *header;
 		if (i == 0)
 			xstrcat(buf, "CCLASS=");
 		snprintf(tmp, sizeof(tmp), "[%s:%u]", 
-- 
GitLab