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

component/slapos/buildout.cfg

@@ -144,6 +144,7 @@ zc.recipe.egg = 1.3.2
 # Use own version of h.r.download to be able to open archives not supported by python2.x: .xz
 hexagonit.recipe.download = 1.7nxd002
 
+slapos.core = 1.0.0
 Jinja2 = 2.7.1
 MarkupSafe = 0.18
 Pygments = 1.6
@@ -158,42 +159,40 @@ netaddr = 0.7.10
 prettytable = 0.7.2
 pyOpenSSL = 0.13.1
 pyparsing = 2.0.1
-setuptools = 1.1.6
-slapos.core = 1.0.0rc6
+setuptools = 2.0.2
 slapos.libnetworkcache = 0.13.4
 slapos.recipe.cmmi = 0.1.1
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 Flask = 0.10.1
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 bpython = 0.12
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 cliff = 1.4.5
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 ipython = 1.1.0
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 netifaces = 0.8
 
 # Required by:
-# slapos.core==1.0.0rc6
-requests = 2.0.0
+# slapos.core==1.0.0
+requests = 2.1.0
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 supervisor = 3.0
 
 # Required by:
-# slapos.core==1.0.0rc6
+# slapos.core==1.0.0
 zope.interface = 4.0.5
-

component/slapos/testing.cfg

@@ -8,4 +8,4 @@ find-links +=
   http://www.nexedi.org/static/packages/source/slapos.core-testing/
 
 [versions]
-slapos.core =
+slapos.core = 1.0.0rc6