svn merge -r21182:21194 https://eris.llnl.gov/svn/slurm/branches/slur…

…m-2.1
chaos · Sep 20, 2010 · 70025b6 · 70025b6
1 parent 8ffcfd0
commit 70025b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -488,6 +488,9 @@ documents those changes that are of interest to users and admins.
     like postgres over mysql for some reason here you go. (Work done
     primarily by Hongjia Cao, NUDT.)
 
+* Changes in SLURM 2.1.15
+=========================
+
 * Changes in SLURM 2.1.14
 =========================
  -- Fixed coding mistakes in _slurm_rpc_resv_show() and job_alloc_info() found
@@ -506,6 +509,7 @@ documents those changes that are of interest to users and admins.
     To fail, the script would need to be executed by user root or SlurmUser
     without the LD_LIBRARY_PATH environment variable set and there would
     have to be a maliciously altered library in the working directory.
+    Thanks to Raphael Geissert for identifying the problem.
 
 * Changes in SLURM 2.1.13
 =========================

diff --git a/doc/html/team.shtml b/doc/html/team.shtml
@@ -36,6 +36,7 @@ Linux NetworX and many other contributors.
 <li>Kent Engstr&ouml;m  (National Supercomputer Centre, Sweden)</li>
 <li>Jim Garlick (LLNL)</li>
 <li>Didier Gazen (Laboratoire d'Aerologie, France)</li>
+<li>Raphael Geissert (Debian)</li>
 <li>Yiannis Georgiou (Bull)</li>
 <li>Mark Grondona (LLNL)</li>
 <li>Takao Hatazaki (HP, Japan)</li>