Commit 180b0290 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'apache'

parents b16310b8 abb99f02
...@@ -61,7 +61,7 @@ buildout-versions = 1.7 ...@@ -61,7 +61,7 @@ buildout-versions = 1.7
hexagonit.recipe.cmmi = 1.5.0 hexagonit.recipe.cmmi = 1.5.0
meld3 = 0.6.8 meld3 = 0.6.8
rdiff-backup = 1.0.5 rdiff-backup = 1.0.5
slapos.cookbook = 0.49 slapos.cookbook = 0.50
slapos.recipe.template = 2.3 slapos.recipe.template = 2.3
# Required by: # Required by:
...@@ -69,21 +69,21 @@ slapos.recipe.template = 2.3 ...@@ -69,21 +69,21 @@ slapos.recipe.template = 2.3
Flask = 0.8 Flask = 0.8
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
PyXML = 0.8.4 PyXML = 0.8.4
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
inotifyx = 0.2.0 inotifyx = 0.2.0
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
# slapos.core==0.24 # slapos.core==0.24
# xml-marshaller==0.9.7 # xml-marshaller==0.9.7
lxml = 2.3.4 lxml = 2.3.4
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
netaddr = 0.7.6 netaddr = 0.7.6
# Required by: # Required by:
...@@ -91,14 +91,14 @@ netaddr = 0.7.6 ...@@ -91,14 +91,14 @@ netaddr = 0.7.6
netifaces = 0.8 netifaces = 0.8
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
# slapos.core==0.24 # slapos.core==0.24
# zc.buildout==1.6.0-dev-SlapOS-004 # zc.buildout==1.6.0-dev-SlapOS-004
# zc.recipe.egg==1.3.2 # zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
slapos.core = 0.24 slapos.core = 0.24
# Required by: # Required by:
...@@ -106,11 +106,11 @@ slapos.core = 0.24 ...@@ -106,11 +106,11 @@ slapos.core = 0.24
supervisor = 3.0a12 supervisor = 3.0a12
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
# Required by: # Required by:
# slapos.cookbook==0.49 # slapos.cookbook==0.50
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
# Required by: # Required by:
......
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