Commit 270894ee authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'kvm'

parents a03da9c5 718fb62f
......@@ -59,7 +59,7 @@ meld3 = 0.6.10
plone.recipe.command = 1.1
pycrypto = 2.6
rdiff-backup = 1.0.5
slapos.cookbook = 0.78.3
slapos.cookbook = 0.79
slapos.recipe.cmmi = 0.2
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2
......@@ -86,15 +86,15 @@ atomize = 0.1.1
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.78.3
# slapos.cookbook==0.79
inotifyx = 0.2.0-1
# Required by:
# slapos.cookbook==0.78.3
# slapos.cookbook==0.79
lock-file = 2.0
# Required by:
# slapos.cookbook==0.78.3
# slapos.cookbook==0.79
netaddr = 0.7.10
# Required by:
......@@ -118,11 +118,11 @@ psutil = 1.0.1
pyflakes = 0.7.3
# Required by:
# slapos.cookbook==0.78.3
# slapos.cookbook==0.79
pytz = 2013b
# Required by:
# slapos.cookbook==0.78.3
# slapos.cookbook==0.79
# slapos.toolbox==0.35.0
slapos.core = 0.35.1
......@@ -135,7 +135,7 @@ supervisor = 3.0b2
unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.78.3
# slapos.cookbook==0.79
# slapos.toolbox==0.35.0
xml-marshaller = 0.9.7
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment