Merge branch 'lamp-hotfix'

Conflicts: software/lamp-template-static/software.cfg software/lamp-template/software.cfg

Merge branch 'lamp-hotfix'
Conflicts: software/lamp-template-static/software.cfg software/lamp-template/software.cfg
68c4a65e · Cédric de Saint Martin · 3bb16d87 · c9edb189 · 68c4a65e · 68c4a65e
Commit 68c4a65e authored Oct 07, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

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

No files found.
--- a/software/lamp-template-static/software.cfg
+++ b/software/lamp-template-static/software.cfg
@@ -39,6 +39,7 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+slapos.cookbook = 0.12

 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically

--- a/software/lamp-template/software.cfg
+++ b/software/lamp-template/software.cfg
@@ -52,6 +52,7 @@ eggs = ${instance-recipe:egg}
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.5.3-dev-SlapOS-010
+slapos.cookbook = 0.12

 [downloadcache-workaround]
 # workaround irritating problem of hexagonit.recipe.cmmi which automatically