[GNUnet-SVN] [taler-deployment] branch master updated: tutorial (instance) -> default

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository deployment.

The following commit(s) were added to refs/heads/master by this push:
     new a96cb8b  tutorial (instance) -> default
a96cb8b is described below

commit a96cb8b0b000c4556eced88049310573aac07ed3
Author: Marcello Stanisci <address@hidden>
AuthorDate: Tue Jul 18 09:21:20 2017 +0200

    tutorial (instance) -> default
---
 config/generate-config | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/generate-config b/config/generate-config
index a01f80c..2b04072 100755
--- a/config/generate-config
+++ b/config/generate-config
@@ -164,13 +164,13 @@ def config(currency, envname, exchange_pub, standalone):
     cfg_put("merchant-instance-Tor", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tor.priv")
     cfg_put("merchant-instance-GNUnet", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/gnunet.priv")
     cfg_put("merchant-instance-Taler", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/taler.priv")
-    cfg_put("merchant-instance-tutorial", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/tutorial.priv")
+    cfg_put("merchant-instance-default", "KEYFILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/default.priv")
 
     cfg_put("merchant-instance-wireformat-Tor", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/tor.json")
     cfg_put("merchant-instance-wireformat-GNUnet", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/gnunet.json")
     cfg_put("merchant-instance-wireformat-Taler", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/taler.json")
     cfg_put("merchant-instance-wireformat-FSF", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/fsf.json")
-    cfg_put("merchant-instance-wireformat-tutorial", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/tutorial.json")
+    cfg_put("merchant-instance-wireformat-default", "TEST_RESPONSE_FILE", 
"${TALER_DEPLOYMENT_SHARED}/merchant/wire/default.json")
 
     coin(currency, "ct_10", "0.10")
     coin(currency, "1", "1")
@@ -239,7 +239,7 @@ def main(currency, envname, outdir, shared_outdir, 
exchange_pub, standalone):
         merchant_wf(envname, "taler", 5, standalone),
         merchant_wf(envname, "tor", 3, standalone),
         merchant_wf(envname, "fsf", 6, standalone),
-        merchant_wf(envname, "tutorial", 7, standalone),
+        merchant_wf(envname, "default", 7, standalone),
     ]
 
     exchange_wireformats = [

-- 
To stop receiving notification emails like this one, please contact
address@hidden