Merge branch 'slapos' into erp5-component

component/python-2.7/buildout.cfg

@@ -25,9 +25,9 @@ python = python2.7
 
 [python2.7]
 recipe = slapos.recipe.cmmi
-package_version = 2.7.4
+package_version = 2.7.5
 package_version_suffix =
-md5sum = 62704ea0f125923208d84ff0568f7d50
+md5sum = 6334b666b7ff2038c761d7b27ba699c1
 
 depends =
   ${gdbm:version}

component/slapos/buildout.cfg

@@ -44,6 +44,8 @@ allow-hosts =
   github.com
   peak.telecommunity.com
 
+unzip = true
+
 # separate from system python
 include-site-packages = false
 exec-sitecustomize = false
@@ -137,14 +139,15 @@ 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.6nxd002
 
-Jinja2 = 2.6
+Jinja2 = 2.7
+MarkupSafe = 0.18
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.10
 lxml = 3.1.2
 meld3 = 0.6.10
 netaddr = 0.7.10
-slapos.libnetworkcache = 0.13.3
+slapos.libnetworkcache = 0.13.4
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 
@@ -166,9 +169,8 @@ setuptools = 0.6c12dev-r88846
 
 # Required by:
 # slapos.core==0.35.2-dev
-supervisor = 3.0b1
+supervisor = 3.0b2
 
 # Required by:
 # slapos.core==0.35.2-dev
 zope.interface = 4.0.5
-