Merge branch 'master' into erp5

CHANGES.txt

-0.10 (unreleased)
+0.11 (not yet released)
+================
+
+ * No change yet.
+
+0.10 (2011-07-01)
 ================
 
  * Add PHPMyAdmin software release used in SlapOS tutorials
  [Cedric de Saint Martin]
+ * Add slaprunner software release [Cedric de Saint Martin]
 
 0.9 (2011-06-24)
 ================

component/slapos/buildout.cfg

@@ -11,6 +11,11 @@ find-links =
 
 versions = versions
 
+# separate from system python
+include-site-packages = false
+exec-sitecustomize = false
+allowed-eggs-from-site-packages =
+
 [lxml-python]
 python = python2.7
 
@@ -24,7 +29,7 @@ eggs =
   slapos.core
 
 [versions]
-zc.buildout = 1.5.3-dev-SlapOS-004
+zc.buildout = 1.5.3-dev-SlapOS-005
 Jinja2 = 2.5.5
 Werkzeug = 0.6.2
 buildout-versions = 1.6
@@ -34,14 +39,14 @@ meld3 = 0.6.7
 netaddr = 0.7.5
 setuptools = 0.6c12dev-r88846
 slapos.core = 0.8
-slapos.libnetworkcache = 0.1
+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
-Flask = 0.6.1
+Flask = 0.7.2
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
@@ -57,4 +62,4 @@ supervisor = 3.0a10
 
 # Required by:
 # slapos.core==0.8
-zope.interface = 3.6.3
+zope.interface = 3.6.4

setup.py

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

software/erp5testnode/software.cfg

@@ -8,6 +8,11 @@ find-links = http://www.nexedi.org/static/packages/source/slapos.buildout/
     http://dist.repoze.org
     http://www.nexedi.org/static/packages/source/
 
+# Separate from site eggs
+allowed-eggs-from-site-packages =
+include-site-packages = false
+exec-sitecustomize = false
+
 versions = versions
 rebootstrap-section = python2.6
 

software/slaprunner/software.cfg

@@ -31,6 +31,7 @@ md5sum = 04b17b8665eb4e11ce3a4661ad98e5e3
 [eggs]
 eggs +=
   slapos.toolbox
+  slapos.core
 
 [versions]
 slapos.cookbook = 0.10