Cleanup

Comments, trailing spaces, dead code

slapos/recipe/addresiliency/__init__.py

@@ -71,13 +71,6 @@ class Recipe(GenericSlapRecipe):
                                      bully_conf))
       path_list.append(script)
 
-      # for testing purposes only
-      scriptNew = self.createExecutable(path_bully_new,
-                                  self.substituteTemplate(
-                                  self.getTemplateFilename('bully_new.py.in'),
-                                  bully_conf))
-      path_list.append(scriptNew)
-
       wrapper = self.createPythonScript(
           path_run,
           'slapos.recipe.librecipe.execute.execute',

stack/lamp/buildout.cfg

@@ -2,9 +2,6 @@
 
 ignore-existing = true
 
-develop =
-  /opt/slapdev
-
 parts =
   apache-php
   mariadb

stack/lamp/instance-resilient.cfg

@@ -4,7 +4,6 @@
 [buildout]
 
 extends =
-#  ${template-resilient:output}
    {{templateapache}}
 
 parts =

stack/resilient/buildout.cfg

@@ -11,7 +11,6 @@ parts =
 #Frozen is the state used to not destroy a broken instance's content
   template-frozen
 
-#
   template-resilient
   template-switchsoftware