Merge branch 'master' into osoetraining

CHANGES.txt

-0.12 (unreleased)
+0.13 (unreleased)
+================
+
+ * No change yet.
+
+0.12 (2011-07-11)
 =================
 
- * No changes yet.
+ * Fix slaprunner, phpmyadmin software releases, added
+   wordpress software release. [Cedric de Saint Martin]
 
 0.11 (2011-07-07)
 =================

component/slapos/buildout.cfg

 [buildout]
 extends =
+  ../../stack/shacache-client.cfg
   ../lxml-python/buildout.cfg
   ../python-2.7/buildout.cfg
 
@@ -32,20 +33,19 @@ eggs =
 zc.buildout = 1.5.3-dev-SlapOS-005
 Jinja2 = 2.5.5
 Werkzeug = 0.6.2
-buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
 lxml = 2.3
 meld3 = 0.6.7
 netaddr = 0.7.5
 setuptools = 0.6c12dev-r88846
-slapos.core = 0.8
+slapos.core = 0.9
 slapos.libnetworkcache = 0.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.8
+# slapos.core==0.9
 Flask = 0.7.2
 
 # Required by:
@@ -53,13 +53,13 @@ Flask = 0.7.2
 hexagonit.recipe.download = 1.5.0
 
 # Required by:
-# slapos.core==0.8
+# slapos.core==0.9
 netifaces = 0.5
 
 # Required by:
-# slapos.core==0.8
+# slapos.core==0.9
 supervisor = 3.0a10
 
 # Required by:
-# slapos.core==0.8
+# slapos.core==0.9
 zope.interface = 3.6.4

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.12dev'
+version = '0.13dev'
 name = 'slapos.cookbook'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

software/erp5/software.cfg

 [buildout]
 extends =
+  ../../stack/shacache-client.cfg
   ../../stack/erp5.cfg
 
 versions = versions

stack/shacache-client.cfg

+[buildout]
+networkcache-section = networkcache
+
+[networkcache]
+download-cache-url = http://www.shacache.org/shacache
+download-dir-url = http://www.shacache.org/shadir