From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 30 Mar 2011 03:09:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myplc
X-Git-Tag: myplc-5.0-18~9^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7c356a06be0b54206e85917c8339d585ae423eec;hp=f27a18a2e47e64560e8f32059625920e44676628;p=myplc.git

Merge branch 'master' of ssh://git.onelab.eu/git/myplc
---

diff --git a/default_config.xml b/default_config.xml
index 726749b..bfaf788 100644
--- a/default_config.xml
+++ b/default_config.xml
@@ -810,6 +810,27 @@ $URL$
         </variable>
       </variablelist>
     </category>
+    <category id="myslice">
+      <name>MySlice</name>
+      <description>MySlice configuration parameters</description>
+      <variablelist>
+	<variable id="comon_url" type="string">
+	  <name>comon</name>
+	  <value></value>
+	  <description>The address of the CoMon url that provides information for this PLC's nodes (if not the default http://comon.cs.princeton.edu/)</description>
+	</variable>
+	<variable id="comon_available" type="boolean">
+	  <name>comon</name>
+	  <value>false</value>
+	  <description>True, if comon data are available for this PLC's nodes</description>
+	</variable>
+	<variable id="tophat_available" type="boolean">
+	  <name>tophat</name>
+	  <value>false</value>
+	  <description>True, if tophat data are available for this PLC's nodes</description>
+	</variable>
+      </variablelist>
+    </category>
   </variables>
 
   <comps>