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

Merge branch 'osoetraining'

parents 717121d1 399a0d40
...@@ -87,4 +87,4 @@ xml-marshaller = 0.9.7 ...@@ -87,4 +87,4 @@ xml-marshaller = 0.9.7
setuptools = 0.6c12dev-r88795 setuptools = 0.6c12dev-r88795
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-001 zc.buildout = 1.5.3-dev-SlapOS-005
...@@ -89,4 +89,4 @@ hexagonit.recipe.download = 1.5.0 ...@@ -89,4 +89,4 @@ hexagonit.recipe.download = 1.5.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-001 zc.buildout = 1.5.3-dev-SlapOS-005
...@@ -86,4 +86,4 @@ hexagonit.recipe.download = 1.5.0 ...@@ -86,4 +86,4 @@ hexagonit.recipe.download = 1.5.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-001 zc.buildout = 1.5.3-dev-SlapOS-005
...@@ -90,4 +90,4 @@ hexagonit.recipe.download = 1.5.0 ...@@ -90,4 +90,4 @@ hexagonit.recipe.download = 1.5.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.5.3-dev-SlapOS-001 zc.buildout = 1.5.3-dev-SlapOS-005
...@@ -47,9 +47,9 @@ python = python2.7 ...@@ -47,9 +47,9 @@ python = python2.7
eggs = ${instance-recipe:egg} eggs = ${instance-recipe:egg}
[versions] [versions]
slapos.cookbook = 0.11 slapos.cookbook = 0.12
# Required by slapos.cookbook==0.11 # Required by slapos.cookbook==0.12
slapos.core = 0.8 slapos.core = 0.8
collective.recipe.template = 1.8 collective.recipe.template = 1.8
netaddr = 0.7.5 netaddr = 0.7.5
......
...@@ -10,6 +10,7 @@ parts = ...@@ -10,6 +10,7 @@ parts =
extends = extends =
../../stack/lamp.cfg ../../stack/lamp.cfg
../../stack/shacache-client.cfg
[application] [application]
url = http://wordpress.org/latest.tar.gz url = http://wordpress.org/latest.tar.gz
...@@ -45,9 +46,9 @@ output = ${buildout:directory}/template.cfg ...@@ -45,9 +46,9 @@ output = ${buildout:directory}/template.cfg
mode = 0644 mode = 0644
[versions] [versions]
slapos.cookbook = 0.11 slapos.cookbook = 0.12
# Required by slapos.cookbook==0.11 # Required by slapos.cookbook==0.12
slapos.core = 0.8 slapos.core = 0.8
collective.recipe.template = 1.8 collective.recipe.template = 1.8
netaddr = 0.7.5 netaddr = 0.7.5
......
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