Commit 56943bbf authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

Merge remote-tracking branch 'origin/master' into erp5-cluster

parents 3f4ab596 906dd9d8
...@@ -8,8 +8,8 @@ extends = ...@@ -8,8 +8,8 @@ extends =
[file] [file]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = ftp://ftp.astron.com/pub/file/file-5.17.tar.gz url = ftp://ftp.astron.com/pub/file/file-5.18.tar.gz
md5sum = e19c47e069ced7b01ccb4db402cc01d3 md5sum = d420d8f2990cd344673acfbf8d76ff5a
configure-options = configure-options =
--disable-static --disable-static
environment = environment =
......
...@@ -152,7 +152,7 @@ cliff = 1.6.1 ...@@ -152,7 +152,7 @@ cliff = 1.6.1
# Required by: # Required by:
# slapos.core==1.0.5 # slapos.core==1.0.5
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==1.0.5 # slapos.core==1.0.5
......
...@@ -234,7 +234,7 @@ lock-file = 2.0 ...@@ -234,7 +234,7 @@ lock-file = 2.0
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -24,7 +24,7 @@ prettytable = 0.7.2 ...@@ -24,7 +24,7 @@ prettytable = 0.7.2
requests = 1.2.3 requests = 1.2.3
slapos.cookbook = 0.82 slapos.cookbook = 0.82
cffi = 0.8.2 cffi = 0.8.2
cryptography = 0.3 cryptography = 0.4
plone.recipe.command = 1.1 plone.recipe.command = 1.1
pyOpenSSL = 0.14 pyOpenSSL = 0.14
six = 1.6.1 six = 1.6.1
...@@ -69,7 +69,7 @@ netaddr = 0.7.10 ...@@ -69,7 +69,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -288,7 +288,7 @@ netaddr = 0.7.10 ...@@ -288,7 +288,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
...@@ -330,7 +330,7 @@ prettytable = 0.7.2 ...@@ -330,7 +330,7 @@ prettytable = 0.7.2
requests = 1.2.3 requests = 1.2.3
cffi = 0.8.1 cffi = 0.8.1
cryptography = 0.2.1 cryptography = 0.4
pyOpenSSL = 0.14 pyOpenSSL = 0.14
six = 1.5.2 six = 1.5.2
......
...@@ -170,7 +170,7 @@ lock-file = 2.0 ...@@ -170,7 +170,7 @@ lock-file = 2.0
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -206,7 +206,7 @@ lock-file = 2.0 ...@@ -206,7 +206,7 @@ lock-file = 2.0
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -63,7 +63,7 @@ netaddr = 0.7.10 ...@@ -63,7 +63,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.14 # slapos.core==0.14
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.cookbook==0.24 # slapos.cookbook==0.24
......
...@@ -63,7 +63,7 @@ netaddr = 0.7.10 ...@@ -63,7 +63,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.14 # slapos.core==0.14
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.cookbook==0.24 # slapos.cookbook==0.24
......
...@@ -86,7 +86,7 @@ netaddr = 0.7.10 ...@@ -86,7 +86,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.28.5 # slapos.core==0.28.5
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# erp5.util==0.4.7 # erp5.util==0.4.7
......
...@@ -192,7 +192,7 @@ Werkzeug = 0.9.4 ...@@ -192,7 +192,7 @@ Werkzeug = 0.9.4
buildout-versions = 1.7 buildout-versions = 1.7
cffi = 0.8.2 cffi = 0.8.2
cmd2 = 0.6.7 cmd2 = 0.6.7
cryptography = 0.3 cryptography = 0.4
erp5.util = 0.4.38 erp5.util = 0.4.38
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
itsdangerous = 0.24 itsdangerous = 0.24
...@@ -228,7 +228,7 @@ lock-file = 2.0 ...@@ -228,7 +228,7 @@ lock-file = 2.0
# Required by: # Required by:
# slapos.core==1.0.5 # slapos.core==1.0.5
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# cffi==0.8.2 # cffi==0.8.2
......
...@@ -89,7 +89,7 @@ prettytable = 0.7.2 ...@@ -89,7 +89,7 @@ prettytable = 0.7.2
requests = 1.2.3 requests = 1.2.3
slapos.cookbook = 0.82 slapos.cookbook = 0.82
cffi = 0.8.2 cffi = 0.8.2
cryptography = 0.3 cryptography = 0.4
plone.recipe.command = 1.1 plone.recipe.command = 1.1
pyOpenSSL = 0.14 pyOpenSSL = 0.14
six = 1.6.1 six = 1.6.1
...@@ -134,7 +134,7 @@ netaddr = 0.7.10 ...@@ -134,7 +134,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -68,7 +68,7 @@ netaddr = 0.7.10 ...@@ -68,7 +68,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -107,7 +107,7 @@ signature-certificate-list = ...@@ -107,7 +107,7 @@ signature-certificate-list =
# Required by: # Required by:
# slapos.core==0.33.1 # slapos.core==0.33.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.cookbook==0.71.1 # slapos.cookbook==0.71.1
......
...@@ -175,7 +175,7 @@ netaddr = 0.7.10 ...@@ -175,7 +175,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# websockify==0.5.1 # websockify==0.5.1
......
...@@ -114,7 +114,7 @@ netaddr = 0.7.10 ...@@ -114,7 +114,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35 # slapos.core==0.35
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35 # slapos.core==0.35
......
...@@ -70,7 +70,7 @@ lxml = 2.3.4 ...@@ -70,7 +70,7 @@ lxml = 2.3.4
# Required by: # Required by:
# slapos.core==0.2 # slapos.core==0.2
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.2 # slapos.core==0.2
......
...@@ -69,7 +69,7 @@ netaddr = 0.7.10 ...@@ -69,7 +69,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -162,7 +162,7 @@ hexagonit.recipe.download = 1.6nxd002 ...@@ -162,7 +162,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by: # Required by:
# slapos.core==0.34 # slapos.core==0.34
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.34 # slapos.core==0.34
......
...@@ -183,7 +183,7 @@ lock-file = 2.0 ...@@ -183,7 +183,7 @@ lock-file = 2.0
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -56,7 +56,7 @@ Werkzeug = 0.9.4 ...@@ -56,7 +56,7 @@ Werkzeug = 0.9.4
buildout-versions = 1.7 buildout-versions = 1.7
cffi = 0.8.2 cffi = 0.8.2
cmd2 = 0.6.7 cmd2 = 0.6.7
cryptography = 0.3 cryptography = 0.4
itsdangerous = 0.24 itsdangerous = 0.24
meld3 = 1.0.0 meld3 = 1.0.0
mr.developer = 1.30 mr.developer = 1.30
...@@ -97,7 +97,7 @@ netaddr = 0.7.11 ...@@ -97,7 +97,7 @@ netaddr = 0.7.11
# Required by: # Required by:
# slapos.core==1.0.5 # slapos.core==1.0.5
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# cffi==0.8.2 # cffi==0.8.2
......
...@@ -154,7 +154,7 @@ itsdangerous = 0.23 ...@@ -154,7 +154,7 @@ itsdangerous = 0.23
lxml = 3.2.3 lxml = 3.2.3
meld3 = 0.6.10 meld3 = 0.6.10
netaddr = 0.7.10 netaddr = 0.7.10
netifaces = 0.8-1 netifaces = 0.10.2
pytz = 2013d pytz = 2013d
requests = 1.2.3 requests = 1.2.3
slapos.cookbook = 0.83.1 slapos.cookbook = 0.83.1
......
...@@ -184,7 +184,7 @@ netaddr = 0.7.10 ...@@ -184,7 +184,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==1.0.0 # slapos.core==1.0.0
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.cookbook==0.85 # slapos.cookbook==0.85
......
...@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002 ...@@ -89,7 +89,7 @@ hexagonit.recipe.download = 1.6nxd002
# Required by: # Required by:
# slapos.core==0.34 # slapos.core==0.34
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -239,7 +239,7 @@ hexagonit.recipe.download = 1.7nxd002 ...@@ -239,7 +239,7 @@ hexagonit.recipe.download = 1.7nxd002
# Required by: # Required by:
# slapos.core==0.34 # slapos.core==0.34
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -346,7 +346,7 @@ feedparser = 5.1.3 ...@@ -346,7 +346,7 @@ feedparser = 5.1.3
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -71,7 +71,7 @@ Flask = 0.9 ...@@ -71,7 +71,7 @@ Flask = 0.9
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
......
...@@ -99,7 +99,7 @@ netaddr = 0.7.10 ...@@ -99,7 +99,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.33.1 # slapos.toolbox==0.33.1
......
...@@ -226,7 +226,7 @@ lock-file = 2.0 ...@@ -226,7 +226,7 @@ lock-file = 2.0
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8-1 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -102,16 +102,16 @@ buildout-versions = 1.7 ...@@ -102,16 +102,16 @@ buildout-versions = 1.7
cffi = 0.8.2 cffi = 0.8.2
cliff = 1.6.1 cliff = 1.6.1
cmd2 = 0.6.7 cmd2 = 0.6.7
cryptography = 0.3 cryptography = 0.4
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
itsdangerous = 0.24 itsdangerous = 0.24
lxml = 3.3.5 lxml = 3.3.5
meld3 = 1.0.0 meld3 = 1.0.0
mr.developer = 1.30 mr.developer = 1.30
netaddr = 0.7.11 netaddr = 0.7.11
netifaces = 0.8-1 netifaces = 0.10.2
plone.recipe.command = 1.1 plone.recipe.command = 1.1
psutil = 2.1.0 psutil = 2.1.1
pyOpenSSL = 0.14 pyOpenSSL = 0.14
pyparsing = 2.0.2 pyparsing = 2.0.2
python-magic = 0.4.6 python-magic = 0.4.6
......
...@@ -588,7 +588,7 @@ scripts = zodbanalyze ...@@ -588,7 +588,7 @@ scripts = zodbanalyze
[cloudooo-repository] [cloudooo-repository]
branch = branch =
revision = 349b179f820c4a096757dda61f620166329cb00b revision = f67af2797f74d4212f7221978645552353f341c8
[slapos-toolbox] [slapos-toolbox]
recipe = zc.recipe.egg recipe = zc.recipe.egg
...@@ -687,7 +687,7 @@ StructuredText = 2.11.1 ...@@ -687,7 +687,7 @@ StructuredText = 2.11.1
WSGIUtils = 0.7 WSGIUtils = 0.7
Werkzeug = 0.9.4 Werkzeug = 0.9.4
apache-libcloud = 0.14.1 apache-libcloud = 0.14.1
astroid = 1.1.0 astroid = 1.1.1
async = 0.6.1 async = 0.6.1
atomize = 0.2.0 atomize = 0.2.0
buildout-versions = 1.7 buildout-versions = 1.7
...@@ -711,7 +711,6 @@ hexagonit.recipe.cmmi = 2.0 ...@@ -711,7 +711,6 @@ hexagonit.recipe.cmmi = 2.0
http-parser = 0.8.3 http-parser = 0.8.3
httplib2 = 0.9 httplib2 = 0.9
iniparse = 0.4 iniparse = 0.4
interval = 1.0.0
inotifyx = 0.2.0-1 inotifyx = 0.2.0-1
interval = 1.0.0 interval = 1.0.0
ipdb = 0.8 ipdb = 0.8
...@@ -726,16 +725,16 @@ minitage.paste = 1.4.6 ...@@ -726,16 +725,16 @@ minitage.paste = 1.4.6
minitage.recipe.common = 1.90 minitage.recipe.common = 1.90
minitage.recipe.egg = 1.107 minitage.recipe.egg = 1.107
netaddr = 0.7.11 netaddr = 0.7.11
netifaces = 0.8-1 netifaces = 0.10.2
ordereddict = 1.1 ordereddict = 1.1
paramiko = 1.13.0 paramiko = 1.13.0
plone.recipe.command = 1.1 plone.recipe.command = 1.1
ply = 3.4 ply = 3.4
polib = 1.0.4 polib = 1.0.4
pprofile = 1.7.1 pprofile = 1.7.1
psutil = 2.1.0 psutil = 2.1.1
pyflakes = 0.8.1 pyflakes = 0.8.1
pylint = 1.2.0 pylint = 1.2.1
pyparsing = 2.0.2 pyparsing = 2.0.2
python-ldap = 2.4.15 python-ldap = 2.4.15
python-magic = 0.4.6 python-magic = 0.4.6
...@@ -748,7 +747,7 @@ six = 1.6.1 ...@@ -748,7 +747,7 @@ six = 1.6.1
slapos.recipe.build = 0.12 slapos.recipe.build = 0.12
slapos.recipe.cmmi = 0.2 slapos.recipe.cmmi = 0.2
slapos.recipe.template = 2.5 slapos.recipe.template = 2.5
slapos.toolbox = 0.39 slapos.toolbox = 0.39.1
smmap = 0.8.2 smmap = 0.8.2
socketpool = 0.5.3 socketpool = 0.5.3
spyne = 2.10.10 spyne = 2.10.10
......
...@@ -151,7 +151,7 @@ netaddr = 0.7.6 ...@@ -151,7 +151,7 @@ netaddr = 0.7.6
# Required by: # Required by:
# slapos.core==0.24 # slapos.core==0.24
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.23 # slapos.toolbox==0.23
......
...@@ -352,7 +352,7 @@ feedparser = 5.1.3 ...@@ -352,7 +352,7 @@ feedparser = 5.1.3
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.34.0 # slapos.toolbox==0.34.0
......
...@@ -360,7 +360,7 @@ netaddr = 0.7.10 ...@@ -360,7 +360,7 @@ netaddr = 0.7.10
# Required by: # Required by:
# slapos.core==0.35.1 # slapos.core==0.35.1
netifaces = 0.8 netifaces = 0.10.2
# Required by: # Required by:
# slapos.toolbox==0.33.1 # slapos.toolbox==0.33.1
......
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