Merge branch 'lamp-hotfix'

af93196e · Cédric de Saint Martin · 99f37fcd · ef7f93b1 · af93196e · af93196e
Commit af93196e authored Oct 10, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

software/lamp-template-static/software.cfg software/lamp-template-static/software.cfg +5 -1

software/lamp-template/software.cfg software/lamp-template/software.cfg +5 -1

No files found.
--- a/software/lamp-template-static/software.cfg
+++ b/software/lamp-template-static/software.cfg
@@ -39,7 +39,11 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.12
+slapos.cookbook = 0.20
+# Temporary fix for slapos-0.50
+[lxml-python]
+find-links += http://pypi.python.org/pypi/lxml/2.3.1
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -52,7 +52,11 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
-slapos.cookbook = 0.12
+slapos.cookbook = 0.20
+# Temporary fix for slapos-0.50
+[lxml-python]
+find-links += http://pypi.python.org/pypi/lxml/2.3.1
 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically