[taler-donau] branch master updated (3d24cee -> 3d530a7)

[gnunet]

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

lukas-matyja pushed a change to branch master
in repository donau.

    from 3d24cee  -fix paths
     new c10cf3d  [testing] use of taler secmod
     new 93fc6fd  Merge remote-tracking branch 'refs/remotes/origin/master'
     new caa18f5  some changes
     new 1c97e42  resolve merge
     new 3d530a7  Merge remote-tracking branch 'refs/remotes/origin/master'

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/donau/donau-httpd_keys.c    | 10 +++++-----
 src/testing/coins-rsa.conf      |  2 +-
 src/testing/test_donau_api.conf |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c
index e71d646..3268200 100644
--- a/src/donau/donau-httpd_keys.c
+++ b/src/donau/donau-httpd_keys.c
@@ -771,11 +771,11 @@ DH_keys_update_states ()
     // .type = htons (TALER_DBEVENT_DONAU_KEYS_UPDATED),
   };
 
-  DH_plugin->event_notify (DH_plugin->cls,
-                           &es,
-                           NULL,
-                           0);
-  key_generation++;
+  // DH_plugin->event_notify (DH_plugin->cls,
+  //                          &es,
+  //                          NULL,
+  //                          0);
+  // key_generation++;
   // DH_resume_keys_requests (false);
 }
 
diff --git a/src/testing/coins-rsa.conf b/src/testing/coins-rsa.conf
index 9348cbc..7a21a34 100644
--- a/src/testing/coins-rsa.conf
+++ b/src/testing/coins-rsa.conf
@@ -1,7 +1,7 @@
 # This file is in the public domain.
 
 # Sections starting with "coin_" specify which denominations
-# the donau should support (and their respective fee structure)
+# the exchange should support (and their respective fee structure)
 [coin_eur_ct_1]
 value = EUR:0.01
 duration_withdraw = 7 days
diff --git a/src/testing/test_donau_api.conf b/src/testing/test_donau_api.conf
index 9cd5b9a..37a4228 100644
--- a/src/testing/test_donau_api.conf
+++ b/src/testing/test_donau_api.conf
@@ -1,5 +1,6 @@
 # This file is in the public domain.
 #
+@INLINE@ coins-rsa.conf
 
 [PATHS]
 TALER_TEST_HOME = test_donau_api_home/

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.