From: Thierry Parmentelat Date: Tue, 19 Aug 2014 09:39:27 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build X-Git-Tag: 5.3.7~42 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c8c281162f6c14fcee8214b22cd9c159c47c493e;hp=-c;p=build.git Merge branch 'master' of ssh://git.onelab.eu/git/build --- c8c281162f6c14fcee8214b22cd9c159c47c493e diff --combined lxc-tags.mk index e420129e,a0656903..eb74955e --- a/lxc-tags.mk +++ b/lxc-tags.mk @@@ -1,13 -1,13 +1,13 @@@ lxc-userspace-GITPATH := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-1.0-12 - transforward-GITPATH := git://git.onelab.eu/transforward.git@transforward-0.1-7 - procprotect-GITPATH := git://git.onelab.eu/procprotect.git@procprotect-0.4-5 - ipfw-GITPATH := git://git.code.sf.net/p/dummynet/code@ipfw-20130423-1 + transforward-GITPATH := git://git.onelab.eu/transforward.git@master + procprotect-GITPATH := git://git.onelab.eu/procprotect.git@master + ipfw-GITPATH := git://git.code.sf.net/p/dummynet/code@155b6cd31089b4763297d579e9c9945393f00c40 comgt-GITPATH := git://git.onelab.eu/comgt.git@0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils.git@plnode-utils-0.2-2 - nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-14 + nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-15 # pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15 @@@ -24,7 -24,7 +24,7 @@@ vsys-GITPATH := git://git.onelab.eu/v vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-49 bind_public-GITPATH := git://git.onelab.eu/bind_public.git@bind_public-0.1-2 sliver-openvswitch-GITPATH := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.3-3 +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master drupal-GITPATH := git://git.onelab.eu/drupal.git@drupal-4.7-15 plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-5.2-4 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 @@@ -44,7 -44,7 +44,7 @@@ oml-GITPATH := git: ### bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.2-4 sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@master - nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-3 + nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4 myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.3-2 #