Commit dac02d85 authored by Łukasz Nowak's avatar Łukasz Nowak

Merge remote-tracking branch 'origin/erp5-luke' into erp5

parents a026f2e7 bc32dcd8
...@@ -6,6 +6,7 @@ extensions = ...@@ -6,6 +6,7 @@ extensions =
find-links = find-links =
http://www.nexedi.org/static/packages/source/slapos.buildout/ http://www.nexedi.org/static/packages/source/slapos.buildout/
http://www.nexedi.org/static/packages/source/hexagonit.recipe.download/
http://dist.repoze.org http://dist.repoze.org
http://www.nexedi.org/static/packages/source/ http://www.nexedi.org/static/packages/source/
http://www.owlfish.com/software/wsgiutils/download.html http://www.owlfish.com/software/wsgiutils/download.html
...@@ -441,7 +442,7 @@ scripts = ...@@ -441,7 +442,7 @@ scripts =
[versions] [versions]
# Use SlapOS patched zc.buildout # Use SlapOS patched zc.buildout
zc.buildout = 1.6.0-dev-SlapOS-004 zc.buildout = 1.6.0-dev-SlapOS-005
# pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs # pin Acquisition and Products.DCWorkflow to Nexedi flavour of eggs
Acquisition = 2.13.7nxd001 Acquisition = 2.13.7nxd001
...@@ -520,7 +521,9 @@ fpconst = 0.7.2 ...@@ -520,7 +521,9 @@ fpconst = 0.7.2
gitdb = 0.5.4 gitdb = 0.5.4
greenlet = 0.3.4 greenlet = 0.3.4
hexagonit.recipe.cmmi = 1.5.0 hexagonit.recipe.cmmi = 1.5.0
hexagonit.recipe.download = 1.5.0 # Use patched hexagonit.recipe.download from
# https://github.com/SlapOS/hexagonit.recipe.download
hexagonit.recipe.download = 1.5.1-dev-slapos-001
http-parser = 0.7.5 http-parser = 0.7.5
huBarcode = 0.63 huBarcode = 0.63
inotifyx = 0.2.0 inotifyx = 0.2.0
......
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