Merge remote-tracking branch 'origin/master' into erp5-component

software/slaprunner/development.cfg

@@ -10,9 +10,9 @@ extends = common.cfg
 
 parts =
 # Development eggs
-  slapos.cookbook-repository
   slapos.toolbox-repository
-  slapos.core-repository
+#  slapos.cookbook-repository
+#  slapos.core-repository
   check-recipe
 #  erp5.util-repository
 # Good elements
@@ -30,8 +30,8 @@ parts =
 
 develop =
   ${:parts-directory}/slapos.toolbox-repository
-  ${:parts-directory}/slapos.cookbook-repository
-  ${:parts-directory}/slapos.core-repository
+#  ${:parts-directory}/slapos.cookbook-repository
+#  ${:parts-directory}/slapos.core-repository
 #  ${:parts-directory}/erp5.util-repository
 
 
@@ -67,8 +67,8 @@ recipe = plone.recipe.command
 stop-on-error = true
 update-command = ${:command}
 command =
-  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
-  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
   grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
+#  grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
+#  grep parts ${buildout:develop-eggs-directory}/slapos.core.egg-link &&
 #  grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
 

software/slaprunner/software.cfg

@@ -5,7 +5,7 @@
 # 2/ Define list of trusted certificates for the cache.
 
 [buildout]
-extends = development.cfg
+extends = common.cfg
 
 [networkcache]
 # signature certificates of the following uploaders.
@@ -205,14 +205,14 @@ pycrypto = 2.6
 pytz = 2013.7
 rdiff-backup = 1.0.5
 requests = 1.2.3
-slapos.cookbook = 0.85
-slapos.core = 1.0.4
+slapos.cookbook = 0.87
+slapos.core = 1.0.5
 slapos.libnetworkcache = 0.13.4
 slapos.recipe.build = 0.11.5
 slapos.recipe.cmmi = 0.2
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.39
+slapos.toolbox = 0.39.1
 smmap = 0.8.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1