Commit 6ffbdc12 authored by Alain Takoudjou's avatar Alain Takoudjou Committed by Tristan Cavelier

Switch to dedicated branches for slapos master

parent 576ac47d
...@@ -25,13 +25,13 @@ repository_id_list = erp5 vifib/master ...@@ -25,13 +25,13 @@ repository_id_list = erp5 vifib/master
[erp5] [erp5]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/erp5.git repository = http://git.erp5.org/repos/erp5.git
branch = master branch = erp5-slapos-upgrade
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[vifib] [vifib]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.core.git repository = http://git.erp5.org/repos/slapos.core.git
branch = master branch = operation-control
git-executable = ${git:location}/bin/git git-executable = ${git:location}/bin/git
[vifib-fix-products-paths] [vifib-fix-products-paths]
...@@ -74,6 +74,11 @@ python-memcached = 1.47 ...@@ -74,6 +74,11 @@ python-memcached = 1.47
facebook-sdk = 0.4.0 facebook-sdk = 0.4.0
google-api-python-client = 1.2 google-api-python-client = 1.2
# stick to Zope 2.12.22 because Zope 2.12.23's
# ObjectManager.__getitem__ is much slower for a module having lots of
# sub objects.
#XX Zope2 = 2.12.22
[networkcache] [networkcache]
# signature certificates of the following uploaders. # signature certificates of the following uploaders.
# Romain Courteaud # Romain Courteaud
......
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