Merge branch 'master' of ssh://git.onelab.eu/git/build

[build.git] / onelab-k22-tags.mk

diff --git a/onelab-k22-tags.mk b/onelab-k22-tags.mk
index 68cdf90..959a856 100644 (file)
--- a/onelab-k22-tags.mk
+++ b/onelab-k22-tags.mk
@@ -14,7 +14,7 @@ comgt-SVNPATH                 := http://svn.onelab.eu/comgt/imports/0.3
 planetlab-umts-tools-GITPATH    := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
 ###
 util-vserver-BUILD-FROM-SRPM := yes # tmp
-util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11
+util-vserver-GITPATH           := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-12
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4
 util-vserver-pl-BRANCH         := 0.3
@@ -42,7 +42,8 @@ pyopenssl-SVNPATH             := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9
 ###
 pyaspects-GITPATH              := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
 ejabberd-GITPATH               := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
-omf-GITPATH                     := git://git.onelab.eu/omf.git@omf-5.3-9
+omf-GITPATH                     := git://git.onelab.eu/omf.git@master
+oml-GITPATH                     := git://git.onelab.eu/oml.git@master
 ###
 sfa-GITPATH                     := git://git.onelab.eu/sfa.git@sfa-1.0-12
 sface-GITPATH                   := git://git.onelab.eu/sface.git@sface-0.1-4