Author: slebresne
Date: Tue Sep 13 17:00:35 2011
New Revision: 1170236

URL: http://svn.apache.org/viewvc?rev=1170236&view=rev
Log:
Fix CFMetata.getMergeShardChance returning readRepairChance
patch by slebresne; reviewed by jbellis for CASSANDRA-3202

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170236&r1=1170235&r2=1170236&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Sep 13 17:00:35 2011
@@ -12,6 +12,7 @@
  * Improve caching of same-version Messages on digest and repair paths
    (CASSANDRA-3158)
  * Randomize choice of first replica for counter increment (CASSANDRA-2890)
+ * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
 
 
 0.8.5

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1170236&r1=1170235&r2=1170236&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
 Tue Sep 13 17:00:35 2011
@@ -447,7 +447,7 @@ public final class CFMetaData
 
     public double getMergeShardsChance()
     {
-        return readRepairChance;
+        return mergeShardsChance;
     }
 
     public boolean getReplicateOnWrite()


Reply via email to