merge from 0.5

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@908557 13f79535-47bb-0310-9956-ffa450edef68
2010-02-10 16:00:19 +00:00 · 2010-02-10 16:00:19 +00:00 · 04dd326277
parent 17bf5d8ef0
commit 04dd326277
2 changed files with 1 additions and 1 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -29,6 +29,7 @@ dev
 * 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
--- a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
+++ b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
@ -153,7 +153,6 @@ public abstract class AbstractReplicationStrategy
            }
        }

-        assert map.size() == targets.size();
        return map;
    }