Merge remote-tracking branch 'origin/master' into credentials

[oweals/gnunet.git] / src / util / test_service_data.conf

diff --git a/src/util/test_service_data.conf b/src/util/test_service_data.conf
index 4424a7bff643ac72564b68fa4ccb23e526bd01aa..c04626b5bc68b7d999d13b6185ead6028595e0cc 100644 (file)
--- a/src/util/test_service_data.conf
+++ b/src/util/test_service_data.conf
@@ -2,7 +2,6 @@
 PORT=12435
 BINDTO=localhost
 PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
 MAXBUF=1024
 DISABLEV6=NO
 ACCEPT_FROM=127.0.0.1;
@@ -14,7 +13,7 @@ HOSTNAME=localhost
 [test_service6]
 PORT=12435
 PIDFILE=/tmp/test-service.pid
-TIMEOUT=30000
+TIMEOUT=30 s
 MAXBUF=1024
 DISABLEV6=NO
 ACCEPT_FROM=127.0.0.1;
@@ -26,12 +25,4 @@ HOSTNAME=::1
 [resolver]
 HOSTNAME=localhost
 
-[dns]
-AUTOSTART = NO
-
-
-
-[nse]
-AUTOSTART = NO
-