Commit ed30ded1 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5testnode

parents bd4e7b44 4721c89b
......@@ -15,8 +15,8 @@ parts =
[openssl]
recipe = slapos.recipe.cmmi
url = https://www.openssl.org/source/openssl-1.0.1f.tar.gz
md5sum = f26b09c028a0541cab33da697d522b25
url = https://www.openssl.org/source/openssl-1.0.1g.tar.gz
md5sum = de62b43dfcd858e66a74bee1c834e959
depends =
${ca-certificates:version}
patch-binary = ${patch:location}/bin/patch
......
......@@ -575,7 +575,7 @@ PasteDeploy = 1.5.2
Pygments = 1.6
argparse = 1.2.1
coverage = 3.7.1
lxml = 3.3.3
lxml = 3.3.4
mr.developer = 1.30
setuptools = 2.2
......@@ -650,13 +650,13 @@ astroid = 1.0.1
async = 0.6.1
atomize = 0.2.0
chardet = 2.2.1
cliff = 1.5.2
cliff = 1.6.0
cmd2 = 0.6.7
csp-eventlet = 0.7.0
ecdsa = 0.11
elementtree = 1.2.7-20070827-preview
erp5.recipe.cmmiforcei686 = 0.1.3
erp5.util = 0.4.36
erp5.util = 0.4.37
erp5diff = 0.8.1.5
eventlet = 0.14.0
feedparser = 5.1.3
......@@ -671,8 +671,8 @@ httplib2 = 0.8
iniparse = 0.4
inotifyx = 0.2.0-1
ipdb = 0.8
ipython = 1.2.1
itsdangerous = 0.23
ipython = 2.0.0
itsdangerous = 0.24
lock-file = 2.0
logilab-common = 0.61.0
meld3 = 0.6.10
......@@ -681,7 +681,7 @@ minitage.core = 2.0.57
minitage.paste = 1.4.6
minitage.recipe.common = 1.90
minitage.recipe.egg = 1.107
netaddr = 0.7.10
netaddr = 0.7.11
netifaces = 0.8-1
ordereddict = 1.1
paramiko = 1.13.0
......@@ -691,10 +691,10 @@ polib = 1.0.4
pprofile = 1.7.1
prettytable = 0.7.3-nxd001
psutil = 2.0.0
pyflakes = 0.7.3
pyflakes = 0.8.1
pylint = 1.1.0
pyparsing = 2.0.1
python-ldap = 2.4.14
python-ldap = 2.4.15
python-magic = 0.4.6
python-memcached = 1.53
qrcode = 4.0.4
......@@ -709,7 +709,7 @@ slapos.toolbox = 0.39
smmap = 0.8.2
socketpool = 0.5.3
spyne = 2.10.10
stevedore = 0.14.1
stevedore = 0.15
suds = 0.4
supervisor = 3.0
threadframe = 0.2
......
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