[GNUnet-SVN] r24761 - gnunet/src/testbed

[gnunet]

Author: harsha
Date: 2012-11-05 17:49:12 +0100 (Mon, 05 Nov 2012)
New Revision: 24761

Modified:
   gnunet/src/testbed/test_testbed_api.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
   gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
Log:
merging configs

Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf    2012-11-05 16:31:13 UTC (rev 
24760)
+++ gnunet/src/testbed/test_testbed_api.conf    2012-11-05 16:49:12 UTC (rev 
24761)
@@ -35,8 +35,7 @@
 PORT = 12365
 
 [ats]
-WAN_QUOTA_OUT = 3932160
-WAN_QUOTA_IN = 3932160
+AUTOSTART = NO
 
 [core]
 PORT = 12092
@@ -77,4 +76,5 @@
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns-helper-service-w32]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
+

Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf 
2012-11-05 16:31:13 UTC (rev 24760)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf 
2012-11-05 16:49:12 UTC (rev 24761)
@@ -75,3 +75,6 @@
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
\ No newline at end of file


Property changes on: 
gnunet/src/testbed/test_testbed_api_testbed_run_topologyclique.conf
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/testbed/test_testbed_api_testbed_run_topologyclique.conf:13878-14093
+/gnunet/src/testbed/test_testbed_api.conf:24759
\ No newline at end of property
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf   
2012-11-05 16:31:13 UTC (rev 24760)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf   
2012-11-05 16:49:12 UTC (rev 24761)
@@ -75,3 +75,6 @@
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
\ No newline at end of file


Property changes on: 
gnunet/src/testbed/test_testbed_api_testbed_run_topologyline.conf
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/testbed/test_testbed_api_testbed_run_topologyline.conf:13878-14093
+/gnunet/src/testbed/test_testbed_api.conf:24759
\ No newline at end of property
Modified: gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf 
2012-11-05 16:31:13 UTC (rev 24760)
+++ gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf 
2012-11-05 16:49:12 UTC (rev 24761)
@@ -76,3 +76,6 @@
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
+
+[gns-helper-service-w32]
+AUTOSTART = NO
\ No newline at end of file


Property changes on: 
gnunet/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/branches/gnunet/mantis_0001616/src/testbed/test_testbed_api_testbed_run_topologyrandom.conf:13878-14093
+/gnunet/src/testbed/test_testbed_api.conf:24759
\ No newline at end of property