From: Thierry Parmentelat Date: Tue, 4 Oct 2011 06:59:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: lxcbuild~62 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=adeab347f6a4908d09ac919c12cbc1a80d83dd6d;hp=13da49f8ad86233c2e1c1288a3315ca250717240;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index ce051dfb..9d93ddb2 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -24,7 +24,7 @@ Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2 -vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-31 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-32 plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-35 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-67 diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index deed1273..d50575a1 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -34,7 +34,7 @@ Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2 vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2 -vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-31 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-32 plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-35 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-67 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index cad93442..2a6dbffb 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -22,7 +22,7 @@ Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-2 -vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-31 +vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-32 plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-35 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-67 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index c5900da9..8f0ef452 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -31,7 +31,7 @@ Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-2 -vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-31 +vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-32 plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-35 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-67