Merge branch 'master' into 1.0

33d4c072 · Alain Takoudjou · afc6eb88 · a7cf2ea1 · 33d4c072
Commit 33d4c072 authored Jul 28, 2015 by Alain Takoudjou
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

software/slaprunner/common.cfg software/slaprunner/common.cfg +2 -2

No files found.
--- a/software/slaprunner/common.cfg
+++ b/software/slaprunner/common.cfg
@@ -66,7 +66,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-import.cfg.in
 output = ${buildout:directory}/instance-runner-import.cfg
-md5sum = a442695f6875ae0b65439c88db1644fb
+md5sum = 6c0a0b0bf28cbcb63831a818edbd6a5d
 mode = 0644

 [template-runner-export-script]
@@ -81,7 +81,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner-export.cfg.in
 output = ${buildout:directory}/instance-runner-export.cfg
-md5sum = 53be4bd07b2af826d9c80eea4185f7cb
+md5sum = ae0851bf632aa932173024106f5b1bdf
 mode = 0644

 [template-resilient]