Index: system_test/replication_testsuite/config/server.properties
===================================================================
--- system_test/replication_testsuite/config/server.properties	(revision 1403413)
+++ system_test/replication_testsuite/config/server.properties	(working copy)
@@ -94,11 +94,11 @@
 # A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
 # segments don't drop below log.retention.size.
 #log.retention.size=1073741824
+log.retention.size=-1
 
 # The maximum size of a log segment file. When this size is reached a new log segment will be created.
 #log.file.size=536870912
-#log.file.size=102400
-log.file.size=128
+log.file.size=102400
 
 # The interval at which log segments are checked to see if they can be deleted according 
 # to the retention policies
@@ -120,3 +120,20 @@
 zk.connectiontimeout.ms=1000000
 
 monitoring.period.secs=1
+max.message.size=1000000
+max.queued.requests=500
+log.roll.hours=168
+log.index.max.size=10485760
+log.index.interval.bytes=4096
+auto.create.topics=true
+controller.socket.timeout.ms=30000
+controller.message.queue.size=10
+default.replication.factor=1
+replica.max.lag.time.ms=10000
+replica.max.lag.bytes=4000
+replica.socket.timeout.ms=30000
+replica.socket.buffersize=65536
+replica.fetch.size=1048576
+replica.fetch.wait.time.ms=500
+replica.fetch.min.bytes=4096
+replica.fetchers=1
Index: system_test/mirror_maker_testsuite/config/server.properties
===================================================================
--- system_test/mirror_maker_testsuite/config/server.properties	(revision 1403413)
+++ system_test/mirror_maker_testsuite/config/server.properties	(working copy)
@@ -94,11 +94,11 @@
 # A size-based retention policy for logs. Segments are pruned from the log as long as the remaining
 # segments don't drop below log.retention.size.
 #log.retention.size=1073741824
+log.retention.size=-1
 
 # The maximum size of a log segment file. When this size is reached a new log segment will be created.
 #log.file.size=536870912
-#log.file.size=102400
-log.file.size=128
+log.file.size=102400
 
 # The interval at which log segments are checked to see if they can be deleted according 
 # to the retention policies
@@ -120,3 +120,20 @@
 zk.connectiontimeout.ms=1000000
 
 monitoring.period.secs=1
+max.message.size=1000000
+max.queued.requests=500
+log.roll.hours=168
+log.index.max.size=10485760
+log.index.interval.bytes=4096
+auto.create.topics=true
+controller.socket.timeout.ms=30000
+controller.message.queue.size=10
+default.replication.factor=1
+replica.max.lag.time.ms=10000
+replica.max.lag.bytes=4000
+replica.socket.timeout.ms=30000
+replica.socket.buffersize=65536
+replica.fetch.size=1048576
+replica.fetch.wait.time.ms=500
+replica.fetch.min.bytes=4096
+replica.fetchers=1