Commit 25395e72 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'wordpress'

parents 47826b73 71b763a9
...@@ -275,7 +275,7 @@ hexagonit.recipe.cmmi = 1.6 ...@@ -275,7 +275,7 @@ hexagonit.recipe.cmmi = 1.6
meld3 = 0.6.8 meld3 = 0.6.8
pycrypto = 2.6 pycrypto = 2.6
rdiff-backup = 1.0.5 rdiff-backup = 1.0.5
slapos.cookbook = 0.65 slapos.cookbook = 0.66
slapos.libnetworkcache = 0.13.2 slapos.libnetworkcache = 0.13.2
slapos.recipe.build = 0.11.2 slapos.recipe.build = 0.11.2
slapos.recipe.download = 1.0.dev-r4053 slapos.recipe.download = 1.0.dev-r4053
...@@ -293,7 +293,7 @@ Flask = 0.9 ...@@ -293,7 +293,7 @@ Flask = 0.9
GitPython = 0.3.2.RC1 GitPython = 0.3.2.RC1
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
PyXML = 0.8.4 PyXML = 0.8.4
# Required by: # Required by:
...@@ -309,17 +309,17 @@ feedparser = 5.1.2 ...@@ -309,17 +309,17 @@ feedparser = 5.1.2
hexagonit.recipe.download = 1.5.1 hexagonit.recipe.download = 1.5.1
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
inotifyx = 0.2.0 inotifyx = 0.2.0
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
# slapos.core==0.28.5 # slapos.core==0.28.5
# xml-marshaller==0.9.7 # xml-marshaller==0.9.7
lxml = 3.0alpha2 lxml = 3.0alpha2
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
netaddr = 0.7.10 netaddr = 0.7.10
# Required by: # Required by:
...@@ -335,7 +335,7 @@ paramiko = 1.7.7.2 ...@@ -335,7 +335,7 @@ paramiko = 1.7.7.2
psutil = 0.6.1 psutil = 0.6.1
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
# slapos.core==0.28.5 # slapos.core==0.28.5
# slapos.toolbox==0.30 # slapos.toolbox==0.30
# zc.buildout==1.6.0-dev-SlapOS-006 # zc.buildout==1.6.0-dev-SlapOS-006
...@@ -343,7 +343,7 @@ psutil = 0.6.1 ...@@ -343,7 +343,7 @@ psutil = 0.6.1
setuptools = 0.6c12dev-r88846 setuptools = 0.6c12dev-r88846
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
# slapos.toolbox==0.30 # slapos.toolbox==0.30
slapos.core = 0.28.5 slapos.core = 0.28.5
...@@ -352,12 +352,12 @@ slapos.core = 0.28.5 ...@@ -352,12 +352,12 @@ slapos.core = 0.28.5
supervisor = 3.0a12 supervisor = 3.0a12
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
# slapos.toolbox==0.30 # slapos.toolbox==0.30
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
# Required by: # Required by:
# slapos.cookbook==0.65 # slapos.cookbook==0.66
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