From: Sree Harsha Totakura <totakura@in.tum.de>
Date: Mon, 5 Nov 2012 16:54:50 +0000 (+0000)
Subject: merging configs
X-Git-Tag: initial-import-from-subversion-38251~11013
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=602457d4dc0a7e45bff9282a6b67b28a34980bd6;p=oweals%2Fgnunet.git

merging configs
---

diff --git a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
index 3eb136e1c..460c01b13 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
@@ -35,8 +35,7 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -77,4 +76,5 @@ AUTOSTART = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyline.conf b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
index 53d0e6f4c..808d49932 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyline.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyline.conf
@@ -35,8 +35,7 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -77,4 +76,5 @@ AUTOSTART = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+
diff --git a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
index 84f338c3e..4eb62a9dc 100644
--- a/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
+++ b/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
@@ -36,8 +36,7 @@ NEIGHBOUR_LIMIT = 50
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -78,4 +77,5 @@ AUTOSTART = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+