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

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index ef295bb..b060191 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -33,7 +33,7 @@ Monitor-SVNPATH                       := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
 pcucontrol-SVNPATH             := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-2/
 nodeconfig-GITPATH              := git://git.planet-lab.org/nodeconfig.git@nodeconfig-4.3-7
 bootmanager-BRANCH             := 4.3
-bootmanager-GITPATH            := git://git.planet-lab.org/bootmanager@bootmanager-4.3-20
+bootmanager-GITPATH            := git://git.planet-lab.org/bootmanager@bootmanager-4.3-21
 pypcilib-GITPATH                := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 bootcd-GITPATH                  := git://git.planet-lab.org/bootcd.git@bootcd-4.2-22
 vserver-reference-GITPATH      := git://git.planet-lab.org/vserver-reference@vserver-reference-4.2-18

diff --git a/onelab-k22-tags.mk b/onelab-k22-tags.mk
index 3470acf..d123f7a 100644 (file)
--- a/onelab-k22-tags.mk
+++ b/onelab-k22-tags.mk
@@ -31,7 +31,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-29
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-30
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-61
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -45,7 +45,7 @@ ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-10
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-16
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-18
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-5
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 6e7a558..a1db7a4 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -30,7 +30,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@master
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-30
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-61
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -44,7 +44,7 @@ ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-10
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-16
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-18
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-5
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 29148f9..498ea4d 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -36,7 +36,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH            := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
 vsys-GITPATH                   := git://git.onelab.eu/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH            := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
-plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-29
+plcapi-GITPATH                  := git://git.onelab.eu/plcapi.git@plcapi-5.0-30
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                  := git://git.onelab.eu/plewww.git@plewww-4.3-61
 www-register-wizard-SVNPATH     := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -50,7 +50,7 @@ ejabberd-GITPATH              := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-10
 oml-GITPATH                     := git://git.onelab.eu/oml.git@oml-2.5.1-1
 ###
-sfa-GITPATH                     := git://git.onelab.eu/sfa.git@master
+sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-18
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-5
 nodeconfig-GITPATH              := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 3ac581f..7a08c26 100644 (file)
--- a/planetlab-k27-tags.mk
+++ b/planetlab-k27-tags.mk
@@ -26,7 +26,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH                    := git://git.planet-lab.org/openvswitch.git
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-29
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-30
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-61
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -38,7 +38,7 @@ pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
 ###
-sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-16
+sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-18
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9
 pyplnet-GITPATH                 := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index e3ac9df..ce8e8a6 100644 (file)
--- a/planetlab-k32-tags.mk
+++ b/planetlab-k32-tags.mk
@@ -33,7 +33,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH                    := git://git.planet-lab.org/openvswitch.git
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-29
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-30
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-61
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -45,7 +45,7 @@ pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
 ###
-sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-16
+sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-18
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 1318842..e860f75 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -25,7 +25,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 openvswitch-GITPATH                    := git://git.planet-lab.org/openvswitch.git
 vsys-GITPATH                   := git://git.planet-lab.org/vsys.git@vsys-0.99-1
 vsys-scripts-GITPATH           := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
-plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-29
+plcapi-GITPATH                  := git://git.planet-lab.org/plcapi@plcapi-5.0-30
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
 plewww-GITPATH                 := git://git.planet-lab.org/plewww@plewww-4.3-61
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
@@ -38,7 +38,7 @@ pyaspects-GITPATH             := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
 omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
 ###
-sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-16
+sfa-GITPATH                    := git://git.planet-lab.org/sfa.git@sfa-1.0-18
 nodeconfig-GITPATH             := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
 bootmanager-GITPATH             := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
 pypcilib-GITPATH               := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-9