Commit 1fd890f5 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

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

parents 601b2291 8a62619b
...@@ -10,9 +10,9 @@ extends = common.cfg ...@@ -10,9 +10,9 @@ extends = common.cfg
parts = parts =
# Development eggs # Development eggs
slapos.cookbook-repository
slapos.toolbox-repository slapos.toolbox-repository
slapos.core-repository # slapos.cookbook-repository
# slapos.core-repository
check-recipe check-recipe
# erp5.util-repository # erp5.util-repository
# Good elements # Good elements
...@@ -30,8 +30,8 @@ parts = ...@@ -30,8 +30,8 @@ parts =
develop = develop =
${:parts-directory}/slapos.toolbox-repository ${:parts-directory}/slapos.toolbox-repository
${:parts-directory}/slapos.cookbook-repository # ${:parts-directory}/slapos.cookbook-repository
${:parts-directory}/slapos.core-repository # ${:parts-directory}/slapos.core-repository
# ${:parts-directory}/erp5.util-repository # ${:parts-directory}/erp5.util-repository
...@@ -67,8 +67,8 @@ recipe = plone.recipe.command ...@@ -67,8 +67,8 @@ recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
update-command = ${:command} update-command = ${: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.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 # grep parts ${buildout:develop-eggs-directory}/erp5.util.egg-link
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# 2/ Define list of trusted certificates for the cache. # 2/ Define list of trusted certificates for the cache.
[buildout] [buildout]
extends = development.cfg extends = common.cfg
[networkcache] [networkcache]
# signature certificates of the following uploaders. # signature certificates of the following uploaders.
...@@ -205,14 +205,14 @@ pycrypto = 2.6 ...@@ -205,14 +205,14 @@ pycrypto = 2.6
pytz = 2013.7 pytz = 2013.7
rdiff-backup = 1.0.5 rdiff-backup = 1.0.5
requests = 1.2.3 requests = 1.2.3
slapos.cookbook = 0.85 slapos.cookbook = 0.87
slapos.core = 1.0.4 slapos.core = 1.0.5
slapos.libnetworkcache = 0.13.4 slapos.libnetworkcache = 0.13.4
slapos.recipe.build = 0.11.5 slapos.recipe.build = 0.11.5
slapos.recipe.cmmi = 0.2 slapos.recipe.cmmi = 0.2
slapos.recipe.download = 1.0.dev-r4053 slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.4.2 slapos.recipe.template = 2.4.2
slapos.toolbox = 0.39 slapos.toolbox = 0.39.1
smmap = 0.8.2 smmap = 0.8.2
xml-marshaller = 0.9.7 xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1 z3c.recipe.scripts = 1.0.1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment