From eb21f9f2c41f2c1d2a11b9c91d193c089b683fd7 Mon Sep 17 00:00:00 2001
From: Remi Palancher <remi-externe.palancher@edf.fr>
Date: Fri, 11 Jul 2014 05:45:46 -0700
Subject: [PATCH] Update comments in sacctmgr dump header
---
NEWS | 1 +
src/sacctmgr/cluster_functions.c | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/NEWS b/NEWS
index a4a592f6cb4..737623926f8 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ documents those changes that are of interest to users and admins.
page.
-- Fix for regression in 14.03.5 with sacctmgr load when Parent has "'"
around it
+ -- Update comments in sacctmgr dump header
* Changes in Slurm 14.03.5
==========================
diff --git a/src/sacctmgr/cluster_functions.c b/src/sacctmgr/cluster_functions.c
index 8859379872b..7fcaa667227 100644
--- a/src/sacctmgr/cluster_functions.c
+++ b/src/sacctmgr/cluster_functions.c
@@ -1114,11 +1114,11 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
if (fprintf(fd,
"# To edit this file start with a cluster line "
"for the new cluster\n"
- "# Cluster - cluster_name:MaxNodesPerJob=50\n"
+ "# Cluster - 'cluster_name':MaxNodesPerJob=50\n"
"# Followed by Accounts you want in this fashion "
"(root is created by default)...\n"
- "# Parent - root\n"
- "# Account - cs:MaxNodesPerJob=5:MaxJobs=4:"
+ "# Parent - 'root'\n"
+ "# Account - 'cs':MaxNodesPerJob=5:MaxJobs=4:"
"MaxProcSecondsPerJob=20:FairShare=399:"
"MaxWallDurationPerJob=40:Description='Computer Science':"
"Organization='LC'\n"
@@ -1128,14 +1128,14 @@ extern int sacctmgr_dump_cluster (int argc, char *argv[])
"Parent THAT HAS ALREADY \n"
"# BEEN CREATED before the account line in this "
"fashion...\n"
- "# Parent - cs\n"
- "# Account - test:MaxNodesPerJob=1:MaxJobs=1:"
+ "# Parent - 'cs'\n"
+ "# Account - 'test':MaxNodesPerJob=1:MaxJobs=1:"
"MaxProcSecondsPerJob=1:FairShare=1:"
"MaxWallDurationPerJob=1:"
"Description='Test Account':Organization='Test'\n"
"# To add users to a account add a line like this after a "
- "Parent - line\n"
- "# User - lipari:MaxNodesPerJob=2:MaxJobs=3:"
+ "Parent - 'line'\n"
+ "# User - 'lipari':MaxNodesPerJob=2:MaxJobs=3:"
"MaxProcSecondsPerJob=4:FairShare=1:"
"MaxWallDurationPerJob=1\n") < 0) {
exit_code = 1;
--
GitLab