Commit ca0d0599 authored by Rafael Monnerat's avatar Rafael Monnerat

Merge changes from lab.nexedi.cn (master)

parents 59a2382d f1d0683b
......@@ -41,6 +41,6 @@ eggs =
[versions]
cns.recipe.symlink = 0.2.3
collective.recipe.environment = 0.2.0
erp5.util = 0.4.42
erp5.util = 0.4.43
plone.recipe.command = 1.1
slapos.recipe.template = 2.8
......@@ -59,5 +59,5 @@ md5sum = 22ffc8e212dcf2db8ad94cf0e5ac4772
[versions]
PyXML = 0.8.5
erp5.util = 0.4.42
erp5.util = 0.4.43
slapos.recipe.template = 2.7
......@@ -16,7 +16,7 @@ pycrypto = 2.6.1
slapos.recipe.download = 1.0.dev-r4053
slapos.recipe.template = 2.7
smmap = 0.9.0
erp5.util = 0.4.42
erp5.util = 0.4.43
pycurl = 7.19.5.1
# Required by:
......
......@@ -79,23 +79,23 @@ apache-libcloud = 0.16.0
ecdsa = 0.11
gitdb = 0.6.0
pycrypto = 2.6.1
slapos.toolbox = 0.51
slapos.toolbox = 0.52
smmap = 0.8.3
# Required by:
# slapos.toolbox==0.45.1
# slapos.toolbox==0.52
GitPython = 0.3.2.1
# Required by:
# slapos.toolbox==0.45.1
# slapos.toolbox==0.52
atomize = 0.2.0
# Required by:
# slapos.toolbox==0.45.1
# slapos.toolbox==0.52
feedparser = 5.1.3
# Required by:
# slapos.toolbox==0.45.1
# slapos.toolbox==0.52
paramiko = 1.15.2
# Required by:
......
......@@ -14,7 +14,7 @@ cns.recipe.symlink = 0.2.3
collective.recipe.environment = 0.2.0
collective.recipe.template = 1.12
ecdsa = 0.13
erp5.util = 0.4.42
erp5.util = 0.4.43
gitdb = 0.6.4
gunicorn = 19.3.0
plone.recipe.command = 1.1
......
......@@ -89,4 +89,4 @@ PasteDeploy = 1.5.2
# Required by:
# cloudooo==1.2.5.dev0
erp5.util = 0.4.42
erp5.util = 0.4.43
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