Merge remote-tracking branch 'origin/erp5-luke' into erp5

a026f2e7 · Łukasz Nowak · 83d6dd1b · 49632f9c · a026f2e7
Commit a026f2e7 authored Apr 05, 2012 by Łukasz Nowak
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

stack/erp5.cfg stack/erp5.cfg +5 -3

No files found.
--- a/stack/erp5.cfg
+++ b/stack/erp5.cfg
@@ -418,10 +418,12 @@ python = ${eggs:python}
 eggs =
  ${lxml-python:egg}
  slapos.toolbox
+  slapos.toolbox[zodbpack]
 scripts =
-  killpidfromfile = slapos.systool:killpidfromfile
+  killpidfromfile
-  onetimedownload = slapos.toolbox:onetimedownload
+  onetimedownload
+  zodbpack
 [cloudooo]
 recipe = zc.recipe.egg
@@ -541,7 +543,7 @@ setuptools = 0.6c12dev-r88846
 slapos.core = 0.24
 slapos.recipe.build = 0.7
 slapos.recipe.template = 2.3
-slapos.toolbox = 0.21
+slapos.toolbox = 0.23
 smmap = 0.8.2
 socketpool = 0.3.0
 supervisor = 3.0a12