svn commit: r910744 - in /incubator/cassandra/trunk: ./ src/java/org/apache/cassandra/net/FileStreamTask.java

[gdusbabek]

Author: gdusbabek
Date: Tue Feb 16 22:53:16 2010
New Revision: 910744

URL: http://svn.apache.org/viewvc?rev=910744&view=rev
Log:
merge from 0.5

Modified:
    incubator/cassandra/trunk/   (props changed)
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java

Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 16 22:53:16 2010
@@ -1,4 +1,4 @@
 /incubator/cassandra/branches/cassandra-0.3:774578-796573
 /incubator/cassandra/branches/cassandra-0.4:810145-834239,834349-834350
-/incubator/cassandra/branches/cassandra-0.5:888872-910385
+/incubator/cassandra/branches/cassandra-0.5:888872-910743
 /incubator/cassandra/trunk:749219-888871

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java?rev=910744&r1=910743&r2=910744&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java 
(original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/FileStreamTask.java 
Tue Feb 16 22:53:16 2010
@@ -36,7 +36,7 @@
 {
     private static Logger logger = Logger.getLogger( FileStreamTask.class );
     
-    public static final int CHUNK_SIZE = 64*1024*1024;
+    public static final int CHUNK_SIZE = 32*1024*1024;
 
     private final String file;
     private final long startPosition;