From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 6 Dec 2011 08:13:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-2.0-2~1
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=c93d4d0631f5a295d209c6cb6f40ead6e2e97913;hp=e80760cd31b6b247f2841ba86a4828fa3be13e56

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

diff --git a/Makefile b/Makefile
index f0202042..d6ecaad2 100644
--- a/Makefile
+++ b/Makefile
@@ -152,5 +152,9 @@ fastsync:
 	+$(RSYNC) ./sfa/ $(SSHURL)/usr/lib\*/python2.\*/site-packages/sfa/
 	$(SSHCOMMAND) exec service sfa restart
 
-.PHONY: sync
+clientsync:
+	+$(RSYNC)  $(BINS) $(SSHURL)/usr/bin/
+
+.PHONY: sync fastsync clientsync
+
 ##########
diff --git a/config/default_config.xml b/config/default_config.xml
index 99c5d374..9a0a8878 100644
--- a/config/default_config.xml
+++ b/config/default_config.xml
@@ -33,12 +33,6 @@ Thierry Parmentelat
           <description>The human readable name for this interface.</description>
         </variable>
 
-        <variable id="aggregate_api_version" type="int">
-          <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>
@@ -169,6 +163,13 @@ Thierry Parmentelat
 	  <value>12346</value>
 	  <description>The port where the aggregate is to be found.</description>
 	</variable>
+
+        <variable id="api_version" type="int">
+          <name>Aggregate Manager API Version</name>
+          <value>1</value>
+          <description>The Aggregate API version</description>
+        </variable>
+
       </variablelist>
 
     </category>