Merge branch 'drupal'

Conflicts:
	slapos/recipe/request.py

slapos/recipe/request.py

@@ -95,9 +95,9 @@ class Recipe(object):
         status = 'not ready yet, please try again'
       except AttributeError:
         status = 'unknown'
-      error_message = 'Connection parameter %s not found. '
-          'Status of requested instance is : %s. If this error persists, '
-          'check this instance.' % (self.failed, status)
+      error_message = 'Connection parameter %s not found. '\
+          'Requested instance is currently %s. If this error persists, '\
+          'check status of this instance.' % (self.failed, status)
       self.logger.error(error_message)
       raise KeyError(error_message)
     return []

stack/lamp/buildout.cfg

@@ -188,29 +188,28 @@ signature-certificate-list =
   -----END CERTIFICATE-----
 
 [versions]
-# Automatically picked by buildout-versions
 Jinja2 = 2.6
 Pygments = 1.5
-Sphinx = 1.1.3
 Werkzeug = 0.8.3
-apache-libcloud = 0.9.1
+apache-libcloud = 0.10.1
 async = 0.6.1
 buildout-versions = 1.7
-docutils = 0.9
+docutils = 0.9.1
 gitdb = 0.5.4
-hexagonit.recipe.cmmi = 1.5.0
+hexagonit.recipe.cmmi = 1.5.1
+ipython = 0.12.1
 meld3 = 0.6.8
-pycrypto = 2.5
+pycrypto = 2.6
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.52
-slapos.recipe.build = 0.7
+slapos.cookbook = 0.54.1
+slapos.recipe.build = 0.9
 slapos.recipe.download = 1.0.dev-r4053
-slapos.recipe.template = 2.3
+slapos.recipe.template = 2.4
 slapos.toolbox = 0.24
 smmap = 0.8.2
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 # slapos.toolbox==0.24
 Flask = 0.8
 
@@ -219,9 +218,13 @@ Flask = 0.8
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.54.1
 PyXML = 0.8.4
 
+# Required by:
+# netaddr==0.7.7
+Sphinx = 1.1.3
+
 # Required by:
 # slapos.toolbox==0.24
 atomize = 0.1.1
@@ -231,57 +234,57 @@ atomize = 0.1.1
 feedparser = 5.1.2
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.54.1
 inotifyx = 0.2.0
 
 # Required by:
-# slapos.cookbook==0.52
-# slapos.core==0.24
+# slapos.cookbook==0.54.1
+# slapos.core==0.25
 # xml-marshaller==0.9.7
 lxml = 2.3.4
 
 # Required by:
-# slapos.cookbook==0.52
-netaddr = 0.7.6
+# slapos.cookbook==0.54.1
+netaddr = 0.7.7
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 netifaces = 0.8
 
 # Required by:
 # slapos.toolbox==0.24
-paramiko = 1.7.7.1
+paramiko = 1.7.7.2
 
 # Required by:
 # slapos.toolbox==0.24
 psutil = 0.4.1
 
 # Required by:
-# slapos.cookbook==0.52
-# slapos.core==0.24
+# slapos.cookbook==0.54.1
+# slapos.core==0.25
 # slapos.toolbox==0.24
-# zc.buildout==1.6.0-dev-SlapOS-003
+# zc.buildout==1.6.0-dev-SlapOS-006
 # zc.recipe.egg==1.3.2
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.54.1
 # slapos.toolbox==0.24
-slapos.core = 0.24
+slapos.core = 0.25
 
 # Required by:
-# slapos.core==0.24
+# slapos.core==0.25
 supervisor = 3.0a12
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.54.1
 # slapos.toolbox==0.24
 xml-marshaller = 0.9.7
 
 # Required by:
-# slapos.cookbook==0.52
+# slapos.cookbook==0.54.1
 zc.recipe.egg = 1.3.2
 
 # Required by:
-# slapos.core==0.24
-zope.interface = 4.0.0
+# slapos.core==0.25
+zope.interface = 4.0.1

stack/slapos.cfg

@@ -58,4 +58,4 @@ eggs =
 # https://github.com/SlapOS/hexagonit.recipe.download
 hexagonit.recipe.download = 1.5.1-dev-slapos-001
 # Use SlapOS patched zc.buildout
-zc.buildout = 1.6.0-dev-SlapOS-004
+zc.buildout = 1.6.0-dev-SlapOS-006