taler-deployment

commit f42c33a99f172ac5f5e046b957f9464c83398459
parent 088e5d870ca46ab7872901fbeb0aff40272e51ff
Author: Christian Grothoff <christian@grothoff.org>
Date:   Thu, 26 May 2016 15:25:04 +0200

change edate to wire_transfer_deadline/delay (#4521), also transfer faster

Diffstat:
M
config/demo.taler.net/taler.conf
 | 
2
+-
M
config/test.taler.net/taler.conf
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/demo.taler.net/taler.conf b/config/demo.taler.net/taler.conf
@@ -27,7 +27,7 @@ WIREFORMAT = test
 SERVE = unix
 UNIXPATH = $HOME/sockets/merchant.http
 KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
-EDATE = 3 week
+WIRE_TRANSFER_DELAY = 1 m
 
 
 [merchantdb-postgres]
diff --git a/config/test.taler.net/taler.conf b/config/test.taler.net/taler.conf
@@ -27,7 +27,7 @@ WIREFORMAT = test
 SERVE = unix
 UNIXPATH = $HOME/sockets/merchant.http
 KEYFILE = ${TALER_DEPLOYMENT_SHARED}/merchant/merchant.priv
-EDATE = 3 week
+WIRE_TRANSFER_DELAY = 1 m
 
 
 [merchantdb-postgres]