Merge branch 'slapos'

component/slapos/buildout.cfg

@@ -112,47 +112,51 @@ scripts =
   slapproxy = slapos.proxy:main
 
 [versions]
-zc.buildout = 1.6.0-dev-SlapOS-004
+zc.buildout = 1.6.0-dev-SlapOS-006
+hexagonit.recipe.download = 1.5.1-dev-slapos-002
 
 # Generated by buildout-versions
 Jinja2 = 2.6
+Pygments = 1.5
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 collective.recipe.template = 1.9
-hexagonit.recipe.cmmi = 1.5.0
+docutils = 0.9.1
+hexagonit.recipe.cmmi = 1.6
+ipython = 0.13
 lxml = 2.3.4
 meld3 = 0.6.8
-netaddr = 0.7.6
-slapos.core = 0.25
+netaddr = 0.7.7
+slapos.core = 0.26.1
 slapos.libnetworkcache = 0.12
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.25
-Flask = 0.8
+# slapos.core==0.26.1
+Flask = 0.9
 
 # Required by:
-# hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.0
+# netaddr==0.7.7
+Sphinx = 1.1.3
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.26.1
 netifaces = 0.8
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.26.1
 # slapos.libnetworkcache==0.12
 # supervisor==3.0a12
-# zc.buildout==1.6.0-dev-SlapOS-004
-# zope.interface==3.8.0
+# zc.buildout==1.6.0-dev-SlapOS-006
+# zope.interface==4.0.1
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.core==0.25
+# slapos.core==0.26.1
 supervisor = 3.0a12
 
 # Required by:
-# slapos.core==0.25
-zope.interface = 3.8.0
+# slapos.core==0.26.1
+zope.interface = 4.0.1