From ad0590f36b452686874f47c7fddd9db24e16da24 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Tue, 29 Jul 2014 09:07:01 -0700
Subject: [PATCH] Add SUG14 keynote info

---
 doc/html/slurm_ug_agenda.shtml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/doc/html/slurm_ug_agenda.shtml b/doc/html/slurm_ug_agenda.shtml
index a4d233bf0e4..7847d0ce57d 100644
--- a/doc/html/slurm_ug_agenda.shtml
+++ b/doc/html/slurm_ug_agenda.shtml
@@ -51,17 +51,17 @@ plus dinner on Wednesday evening.<br>
  </tr>
 
 <tr>
-  <td>08:30 - 08:45</td>
+  <td>08:30 - 08:40</td>
   <td>Welcome</td>
   <td>TBD (CSCS)</td>
   <td>Welcome to Slurm User Group Meeting</td>
 </tr>
 
 <tr>
-  <td>08:45 - 09:30</td>
+  <td>08:40 - 09:30</td>
   <td>Keynote</td>
-  <td>TBD</td>
-  <td>TBD</td>
+  <td>Prof. Felix Sch&uuml;rmann (EPFL)</td>
+  <td>European Human Brain Project</td>
 </tr>
 
 <tr>
@@ -320,8 +320,14 @@ tel +41(0)91 923 10 68</td>
 
 <h2>September 23, 2014</h2>
 
+<h3>Keynote</h3>
+<p>Prof. Felix Sch&uuml;rmann (Ecole Polytechnique F&eacute;d&eacute;rale de Lausanne)</p>
+<p>Dr. Felix Sch&uuml;rmann is adjunct professor at the Ecole Polytechnique
+F&eacute;d&eacute;rale de Lausanne, co-director of the Blue Brain Project
+and involved in several research challenges of the European Human Brain Project.</p>
+
 <h3>Overview of Slurm Versions 14.03 and 14.11</h3>
-<p> Morris Jette (SchedMD), Yiannis Georgiou (Bull)</p>
+<p>Morris Jette (SchedMD), Yiannis Georgiou (Bull)</p>
 <p>This presentation will describe new capabilities provided in Slurm
   versions 14.03 (released March 2014) and planned for version 14.11
   (to be released in November 2014). Major enhancements in version 14.03
@@ -859,6 +865,6 @@ tel +41(0)91 923 10 68</td>
   system to dynamically allocate disk space on our test high-IOPS SSD
   scratch system.</p>
 
-<p style="text-align:center;">Last modified 28 July 2014</p>
+<p style="text-align:center;">Last modified 29 July 2014</p>
 
 <!--#include virtual="footer.txt"-->
-- 
GitLab