From: S.Çağlar Onur Date: Mon, 11 Oct 2010 20:29:25 +0000 (-0400) Subject: Setting tag nodemanager-2.0-20 X-Git-Tag: 5.0-rc16~54 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2d1b0d47c787088701e89c711535e45039d3a27e;p=build.git Setting tag nodemanager-2.0-20 Re-tag nodemanager to include conflicted commits --- diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk index cbb47707..12264ca3 100644 --- a/onelab-k27-tags.mk +++ b/onelab-k27-tags.mk @@ -20,7 +20,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-19 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-19 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-20 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-14 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 diff --git a/onelab-tags.mk b/onelab-tags.mk index 81b74fe2..930ce7b7 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -21,7 +21,7 @@ util-vserver-pl-BRANCH := 0.3 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-19 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-20 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-14 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk index 7320cc7b..0df8b751 100644 --- a/planetlab-k27-tags.mk +++ b/planetlab-k27-tags.mk @@ -12,7 +12,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-19 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-19 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-20 # Trellis-specific NodeManager plugins NodeManager-topo-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-topo/trunk NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index 3a37957e..5cfe3271 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -12,7 +12,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-19 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-19 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-20 # Trellis-specific NodeManager plugins NodeManager-topo-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-topo/trunk NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk diff --git a/planetlab-tags.mk b/planetlab-tags.mk index b54a6469..16ce2ac5 100644 --- a/planetlab-tags.mk +++ b/planetlab-tags.mk @@ -16,7 +16,7 @@ util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vs nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-19 +nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-20 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.planet-lab.org/codemux.git@CoDemux-0.1-14 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2