Merge branch 'osoetraining'

software/kumofs/software.cfg

@@ -87,4 +87,4 @@ xml-marshaller = 0.9.7
 setuptools = 0.6c12dev-r88795
 
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-005

software/mariadb/software.cfg

@@ -89,4 +89,4 @@ hexagonit.recipe.download = 1.5.0
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-005

software/memcached/software.cfg

@@ -86,4 +86,4 @@ hexagonit.recipe.download = 1.5.0
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-005

software/mysql-5.1/software.cfg

@@ -90,4 +90,4 @@ hexagonit.recipe.download = 1.5.0
 plone.recipe.command = 1.1
 
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.5.3-dev-SlapOS-001
+zc.buildout = 1.5.3-dev-SlapOS-005

software/phpmyadmin/software.cfg

@@ -47,9 +47,9 @@ python = python2.7
 eggs = ${instance-recipe:egg}
 
 [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
 collective.recipe.template = 1.8
 netaddr = 0.7.5

software/wordpress/software.cfg

@@ -10,6 +10,7 @@ parts =
   
 extends =
   ../../stack/lamp.cfg
+  ../../stack/shacache-client.cfg
 
 [application]
 url = http://wordpress.org/latest.tar.gz
@@ -45,9 +46,9 @@ output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [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
 collective.recipe.template = 1.8
 netaddr = 0.7.5