apache-frontend: 1.0.6 Merge branch 'master' into 1.0

software/apache-frontend/software.cfg

@@ -3,31 +3,42 @@ extends = common.cfg
 
 [versions]
 PyRSS2Gen = 1.1
-apache-libcloud = 0.15.1
-async = 0.6.1
+apache-libcloud = 0.17.0
 cns.recipe.symlink = 0.2.3
-collective.recipe.template = 1.11
-ecdsa = 0.11
-gitdb = 0.5.4
+ecdsa = 0.13
+gitdb = 0.6.4
 plone.recipe.command = 1.1
 pycrypto = 2.6.1
 rdiff-backup = 1.0.5
-slapos.recipe.template = 2.7
-slapos.toolbox = 0.40.4
-smmap = 0.8.2
+slapos.recipe.template = 2.8
+slapos.toolbox = 0.50
+smmap = 0.9.0
 
 # Required by:
-# slapos.toolbox==0.40.2
-GitPython = 0.3.2.RC1
+# slapos.toolbox==0.50
+GitPython = 1.0.1
 
 # Required by:
-# slapos.toolbox==0.40.2
+# slapos.toolbox==0.50
 atomize = 0.2.0
 
 # Required by:
-# slapos.toolbox==0.40.2
-feedparser = 5.1.3
+# apache-libcloud==0.17.0
+backports.ssl-match-hostname = 3.4.0.2
 
 # Required by:
-# slapos.toolbox==0.40.2
+# slapos.toolbox==0.50
+feedparser = 5.2.1
+
+# Required by:
+# slapos.toolbox==0.50
+lockfile = 0.10.2
+
+# Required by:
+# slapos.toolbox==0.50
 paramiko = 1.15.2
+
+# Required by:
+# slapos.toolbox==0.50
+rpdb = 0.1.5
+

software/slaprunner/instance-runner-export.cfg.in

@@ -7,7 +7,6 @@ parts +=
   nginx-launcher
   certificate-authority
   ca-nginx
-  ca-shellinabox
   gunicorn-launcher
   gunicorn-graceful
   sshkeys-dropbear-runner
@@ -19,7 +18,6 @@ parts +=
   slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
-  shellinabox-promise
   symlinks
   shellinabox
   slapos-cfg

software/slaprunner/instance-runner-import.cfg.in

@@ -7,7 +7,6 @@ parts +=
   nginx-launcher
   certificate-authority
   ca-nginx
-  ca-shellinabox
   gunicorn-launcher
   gunicorn-graceful
   sshkeys-dropbear-runner
@@ -17,7 +16,6 @@ parts +=
   slaprunner-supervisord-wrapper
   dropbear-promise
   runtestsuite
-  shellinabox-promise
   shellinabox
   symlinks
   slapos-cfg