Commit 006a6b0e authored by Gabriel Monnerat's avatar Gabriel Monnerat

Unfreeze ERP5 and slapos

parent cd3d6109
......@@ -146,8 +146,7 @@ parts =
[slapos.cookbook-repository]
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/slapos.git
branch = master
revision = 37e8251765da7c80e6470a28c8c07c70ec30e7c6
branch = erp5
git-executable = ${git:location}/bin/git
[check-recipe]
......@@ -345,7 +344,6 @@ repository_id_list = erp5
recipe = slapos.recipe.build:gitclone
repository = http://git.erp5.org/repos/erp5.git
branch = master
revision = a8f6c841b736091efbbc4e1416db783cdc2e5fee
git-executable = ${git:location}/bin/git
[fix-products-paths]
......@@ -543,7 +541,7 @@ entry-points =
scripts = zodbanalyze
[cloudooo-repository]
branch = master
branch =
revision = 349b179f820c4a096757dda61f620166329cb00b
[slapos-toolbox]
......@@ -700,7 +698,7 @@ requests = 2.2.1
restkit = 4.2.2
rtjp-eventlet = 0.3.2
six = 1.6.1
slapos.recipe.build = 0.11.6
slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5
slapos.toolbox = 0.39
......
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