Commit 33d4c072 authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into 1.0

parents afc6eb88 a7cf2ea1
...@@ -66,7 +66,7 @@ mode = 0644 ...@@ -66,7 +66,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-import.cfg.in url = ${:_profile_base_location_}/instance-runner-import.cfg.in
output = ${buildout:directory}/instance-runner-import.cfg output = ${buildout:directory}/instance-runner-import.cfg
md5sum = a442695f6875ae0b65439c88db1644fb md5sum = 6c0a0b0bf28cbcb63831a818edbd6a5d
mode = 0644 mode = 0644
[template-runner-export-script] [template-runner-export-script]
...@@ -81,7 +81,7 @@ mode = 0644 ...@@ -81,7 +81,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-runner-export.cfg.in url = ${:_profile_base_location_}/instance-runner-export.cfg.in
output = ${buildout:directory}/instance-runner-export.cfg output = ${buildout:directory}/instance-runner-export.cfg
md5sum = 53be4bd07b2af826d9c80eea4185f7cb md5sum = ae0851bf632aa932173024106f5b1bdf
mode = 0644 mode = 0644
[template-resilient] [template-resilient]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment