From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Wed, 23 Nov 2011 17:54:00 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-0~5
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=a665d295716a0f85228d4990ac05397d1b4ffffe;hp=-c

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

a665d295716a0f85228d4990ac05397d1b4ffffe
diff --combined config/default_config.xml
index 5993d1f5,0edfd488..c515a57e
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@@ -18,12 -18,27 +18,27 @@@ Thierry Parmentela
        <description>Basic system variables.</description>
  
        <variablelist>
+         <variable id="generic_flavour" type="string">
+           <name>Generic Flavour</name>
+           <value>pl</value>
+           <description>This string refers to a class located in sfa.generic that describes 
+           which specific implementation needs to be used for api, manager and driver objects.
+           PlanetLab users do not need to change this setting.
+           </description>
+         </variable>
+ 
          <variable id="interface_hrn" type="string">
            <name>Human readable name</name>
            <value>plc</value>
            <description>The human readable name for this interface.</description>
          </variable>
  
+         <variable id="aggregate_api_version" type="string">
+           <name>Aggregate Manager API Version</name>
+           <value>1</value>
+           <description>The Aggregate API version</description>
+         </variable>
+ 
          <variable id="credential_schema" type="string">
            <name>Credential Schema</name>
            <value>/etc/sfa/credential.xsd</value>
@@@ -53,15 -68,6 +68,6 @@@
              </description> 
          </variable>
  
- 	<variable id="generic_flavour" type="string">
- 	  <name>Generic Flavour</name>
- 	  <value>pl</value>
- 	  <description>This string refers to a class located in sfa.generic that describes 
- 	  which specific implementation needs to be used for api, manager and driver objects.
- 	  PlanetLab users do not need to change this setting.
- 	  </description>
- 	</variable>
- 
        </variablelist>
      </category>
  
@@@ -194,12 -200,6 +200,12 @@@
        <description>The settings that tell this SFA instance where to find its database. You can essentially leave this as-is unless you plan on hosting your data on some other box.</description>
  
        <variablelist>
 +	<variable id="enabled" type="boolean">
 +	  <name>Enabled</name>
 +	  <value>true</value>
 +	  <description>Enable the database server on this machine.</description>
 +	</variable>
 +
  	<variable id="host" type="hostname">
  	  <name>Database host</name>
  	  <value>localhost</value>