Commit c3d6ba96 authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'master' into 1.0

parents f581d489 05c1d45b
...@@ -136,7 +136,7 @@ requests = 2.13.0 ...@@ -136,7 +136,7 @@ requests = 2.13.0
setuptools = 33.1.1 setuptools = 33.1.1
six = 1.10.0 six = 1.10.0
slapos.cookbook = 1.0.52 slapos.cookbook = 1.0.52
slapos.core = 1.3.18 slapos.core = 1.4.0
slapos.extension.strip = 0.4 slapos.extension.strip = 0.4
slapos.libnetworkcache = 0.15 slapos.libnetworkcache = 0.15
slapos.rebootstrap = 4.1 slapos.rebootstrap = 4.1
...@@ -148,7 +148,7 @@ xml-marshaller = 0.9.7 ...@@ -148,7 +148,7 @@ xml-marshaller = 0.9.7
paramiko = 2.1.3 paramiko = 2.1.3
# Required by: # Required by:
# slapos.core==1.3.18 # slapos.core==1.4.0
Flask = 0.12 Flask = 0.12
# Required by: # Required by:
...@@ -168,7 +168,7 @@ ipaddress = 1.0.18 ...@@ -168,7 +168,7 @@ ipaddress = 1.0.18
jsonschema = 2.6.0 jsonschema = 2.6.0
# Required by: # Required by:
# slapos.core==1.3.18 # slapos.core==1.4.0
# XXX 'slapos node format' raises an exception with netifaces 0.10.5. # XXX 'slapos node format' raises an exception with netifaces 0.10.5.
netifaces = 0.10.4 netifaces = 0.10.4
...@@ -181,15 +181,15 @@ packaging = 16.8 ...@@ -181,15 +181,15 @@ packaging = 16.8
pycparser = 2.17 pycparser = 2.17
# Required by: # Required by:
# slapos.core==1.3.18 # slapos.core==1.4.0
supervisor = 3.3.3 supervisor = 3.3.3
# Required by: # Required by:
# slapos.core==1.3.18 # slapos.core==1.4.0
uritemplate = 3.0.0 uritemplate = 3.0.0
# Required by: # Required by:
# slapos.core==1.3.18 # slapos.core==1.4.0
zope.interface = 4.3.3 zope.interface = 4.3.3
[networkcache] [networkcache]
......
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