From: root Date: Thu, 16 Dec 2010 23:00:19 +0000 (-0500) Subject: Merge commit 'origin/master' X-Git-Tag: 5.0-rc18~161 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ad1e8eb947ba2d759c46e7643d74a861cacde135;p=build.git Merge commit 'origin/master' --- ad1e8eb947ba2d759c46e7643d74a861cacde135 diff --cc planetlab-k32-tags.mk index 26f5f260,96baf4e9..fc3df8b5 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@@ -36,16 -36,13 +36,16 @@@ pyopenssl-SVNPATH := http://svn.planet ### pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-0 ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2 -omf-GITPATH := git://git.planet-lab.org/omf.git@omf-5.3-8 +omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-8 ### - sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-10 + sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-11 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-3 -bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-15 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-6 +DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 +pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-9 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14 bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6 vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-4 bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@BootstrapFS-2.0-6 diff --cc planetlab-tags.mk index 38434ce5,afc03ec5..46dd68c5 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@@ -39,9 -39,9 +39,9 @@@ pyaspects-GITPATH := git://git.planet- 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-8 ### - sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-10 + sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-11 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-3 -bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-14 +bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-15 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-6 bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-6