slaprunner: Merge branch 'slaprunner' with master

software/slaprunner/common.cfg

@@ -28,21 +28,21 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
 output = ${buildout:directory}/template.cfg
+md5sum = 5de75f295f9382a587343718bb1be124
 mode = 0644
-#md5sum = 5307e4200f044ae57b504ad68444491c
 
 [template-runner]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg
-#md5sum = 91d6550c43b7a43a999724af4650ae40
+md5sum = e1d9aeeb3b02dfb3578eddfddd44d053
 mode = 0644
 
 [instance-resilient]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
 rendered = ${buildout:directory}/instance-resilient.cfg
-
+md5sum = f533d354da36e1bb10819fab8a90109a
 context = key buildout buildout:bin-directory
           key develop_eggs_directory buildout:develop-eggs-directory
           key eggs_directory buildout:eggs-directory
@@ -56,12 +56,14 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
+md5sum = b37ec3af1898834041d8032ff755bac3
 mode = 0644
 
 [instance-runner-export]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
+md5sum = 4028924d0edb61bdcfbf03bb2bac43b8
 mode = 0644
 
 [eggs]

software/slaprunner/development.cfg

@@ -32,7 +32,7 @@ develop =
 [slapos.cookbook-repository]
 recipe = slapos.recipe.build:gitclone
 repository = http://git.erp5.org/repos/slapos.git
-branch = slaprunner-resiliency
+branch = slaprunner
 git-executable = ${git:location}/bin/git
 
 #[slapos.core-repository]