Merge branch 'slaprunner'

c5c304b1 · Cédric de Saint Martin · aa7a24fb · b6c68c74 · c5c304b1
Commit c5c304b1 authored Dec 18, 2012 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

software/slaprunner/software.cfg software/slaprunner/software.cfg +2 -2

No files found.
--- a/software/slaprunner/software.cfg
+++ b/software/slaprunner/software.cfg
@@ -43,7 +43,7 @@ netaddr = 0.7.10
 plone.recipe.command = 1.1
 pycrypto = 2.6
 pytz = 2012h
-slapos.cookbook = 0.70.1-dev
+slapos.cookbook = 0.70
 slapos.core = 0.33.1
 slapos.libnetworkcache = 0.13.3
 slapos.recipe.build = 0.11.5
@@ -88,7 +88,7 @@ psutil = 0.6.1

 # Required by:
 # cns.recipe.symlink==0.2.3
-# slapos.cookbook==0.70.1-dev
+# slapos.cookbook==0.70
 # slapos.core==0.33.1
 # slapos.libnetworkcache==0.13.3
 # slapos.toolbox==0.32