Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 21 Feb 2013 13:51:21 +0000 (14:51 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 21 Feb 2013 13:51:21 +0000 (14:51 +0100)
Conflicts:
onelab-tags.mk

modules.list

index f83df33..9230f4a 100644 (file)
@@ -10,6 +10,7 @@ fprobe-ulog
 ipfw
 iptables
 libvirt
+libvirt:1.0
 linux-2.6:32
 lxcsu
 lxctools