From 5b8f542a548e8678ab68c359b91c1a194cf55fed Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 24 Mar 2009 20:31:05 +0000
Subject: [PATCH] Update release notes with topology info

---
 RELEASE_NOTES      | 5 +++--
 RELEASE_NOTES_LLNL | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index e9543e73279..11e5b36cdeb 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -103,8 +103,9 @@ CONFIGURATION FILE CHANGES (see "man slurm.conf" for details)
   SLURM's SPANK cpuset plugin is no longer be needed.
 * Resource allocations can not be optimized according to network topology.
   The following switch topology configuration options have been added: 
-  TopologyPlugin, SwitchName, Nodes, Switches. More information is available
-  here:  https://computing.llnl.gov/linux/slurm/topology.html
+  TopologyPlugin and in a new topology.conf file: SwitchName, Nodes, 
+  Switches. More information is available in man pages for slurm.conf, 
+  topology.conf, and https://computing.llnl.gov/linux/slurm/topology.html
 * BLUEGENE - Added option DenyPassthrough in the bluegene.conf.  Can be set
   to any combination of X,Y,Z to not allow passthroughs when running in 
   dynamic layout mode. (see "man bluegene.conf" for details)
diff --git a/RELEASE_NOTES_LLNL b/RELEASE_NOTES_LLNL
index 56048f4a73a..b0db71544df 100644
--- a/RELEASE_NOTES_LLNL
+++ b/RELEASE_NOTES_LLNL
@@ -9,12 +9,11 @@ said sampling rate from the default (every 30 seconds) by setting the
 "JobAcctGatherFrequency" option to a different number of seconds in 
 the slurm.conf.
 
-For InfiniBand switch systems, set TopologyType=topology/tree and 
-add switch topology information to a new file called topology.conf. 
-Options used are SwitchName, Switches, and Nodes. The SwitchName is 
-any convenient name for bookkeeping purposes only. For example:
+For InfiniBand switch systems, set TopologyType=topology/tree in slurm.conf
+and add switch topology information to a new file called topology.conf. 
+Options used are SwitchName, Switches, and Nodes. The SwitchName is any 
+convenient name for bookkeeping purposes only. For example:
 # Switch Topology Information
-TopologyPlugin=topology/slurm.conf
 SwitchName=s0 Nodes=tux[0-11]
 SwitchName=s1 Nodes=tux[12-23]
 SwitchName=s2 Nodes=tux[24-35]
-- 
GitLab