svn commit: r908557 - in /incubator/cassandra/trunk: ./ CHANGES.txt src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java

[jbellis]

Author: jbellis
Date: Wed Feb 10 16:00:19 2010
New Revision: 908557

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

Modified:
    incubator/cassandra/trunk/   (props changed)
    incubator/cassandra/trunk/CHANGES.txt
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java

Propchange: incubator/cassandra/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 10 16:00:19 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-908312
+/incubator/cassandra/branches/cassandra-0.5:888872-908556
 /incubator/cassandra/trunk:749219-888871

Modified: incubator/cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/CHANGES.txt?rev=908557&r1=908556&r2=908557&view=diff
==============================================================================
--- incubator/cassandra/trunk/CHANGES.txt (original)
+++ incubator/cassandra/trunk/CHANGES.txt Wed Feb 10 16:00:19 2010
@@ -29,6 +29,7 @@
  * ensure all files for an sstable are streamed to the same directory.
    (CASSANDRA-716)
  * more accurate load estimate for bootstrapping (CASSANDRA-762)
+ * tolerate dead or unavailable bootstrap target on write (CASSANDRA-731)
 
 
 0.5.0 final

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java?rev=908557&r1=908556&r2=908557&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
 Wed Feb 10 16:00:19 2010
@@ -153,7 +153,6 @@
             }
         }
 
-        assert map.size() == targets.size();
         return map;
     }