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

component/slapos/buildout.cfg

@@ -135,7 +135,7 @@ mr.developer = 1.30
 netaddr = 0.7.11
 pyparsing = 2.0.2
 six = 1.6.1
-slapos.core = 1.1.1
+slapos.core = 1.1.2
 slapos.libnetworkcache = 0.14.1
 slapos.recipe.cmmi = 0.2
 stevedore = 0.15
@@ -143,29 +143,25 @@ xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==1.1.1
+# slapos.core==1.1.2
 Flask = 0.10.1
 
 # Required by:
-# slapos.core==1.1.1
+# slapos.core==1.1.2
 cliff = 1.6.1
 
 # Required by:
-# slapos.core==1.1.1
-netifaces = 0.10.4
+# slapos.core==1.1.2
+netifaces = 0.10.3
 
 # Required by:
-# slapos.core==1.1.1
-psutil = 2.1.1
-
-# Required by:
-# slapos.core==1.1.1
+# slapos.core==1.1.2
 requests = 2.3.0
 
 # Required by:
-# slapos.core==1.1.1
+# slapos.core==1.1.2
 supervisor = 3.0
 
 # Required by:
-# slapos.core==1.1.1
+# slapos.core==1.1.2
 zope.interface = 4.1.1