Merge remote branch 'origin/master'

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 7e6ef27..0f85ac1 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -19,7 +19,7 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-14
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-15
+NodeManager-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/tags/nodemanager-2.0-16
 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
@@ -40,7 +40,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@master
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-6
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 5434a98..eba8212 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -21,7 +21,7 @@ util-vserver-pl-BRANCH                := 0.3
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-31
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-15
+NodeManager-SVNPATH             := http://svn.planet-lab.org/svn/NodeManager/tags/nodemanager-2.0-16
 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
@@ -42,7 +42,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@master
+omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-6
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2

diff --git a/planetlab-k27-tags.mk b/planetlab-k27-tags.mk
index 32c5483..a548a18 100644 (file)
--- 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-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-14
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-15
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/nodemanager-2.0-16
 # 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
@@ -36,7 +36,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-5
+omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-6
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2

diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk
index 86f1148..c9edab3 100644 (file)
--- 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-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-14
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-15
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/nodemanager-2.0-16
 # 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
@@ -36,7 +36,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-5
+omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-6
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index ec4ea36..8da5c8a 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -16,7 +16,7 @@ util-vserver-pl-SVNPATH               := http://svn.planet-lab.org/svn/util-vserver-pl/tags/u
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/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-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-15
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/nodemanager-2.0-16
 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
@@ -37,7 +37,7 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.3-2
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-1
-omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-5
+omf-GITPATH                    := git://git.onelab.eu/omf@omf-5.3-6
 ###
 sfa-SVNPATH                    := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-5.0-2