natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Benedict Elliott Smith 2014-09-16 20:48:57 +01:00
parent 61a27af490 109313c3ed
commit 8215744ffb
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -22,6 +22,7 @@
2.1.1
* cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
* Fix saving caches when a table is dropped (CASSANDRA-7784)
* Add better error checking of new stress profile (CASSANDRA-7716)
* Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)

3
tools/stress/src/org/apache/cassandra/stress/settings/OptionReplication.java
View File

@ -51,7 +51,8 @@ class OptionReplication extends OptionMulti
public Map<String, String> getOptions()
{
Map<String, String> options = extraOptions();
options.put("replication_factor", factor.value());
if (!options.containsKey("replication_factor") && (strategy.value().equals("org.apache.cassandra.locator.SimpleStrategy") || factor.setByUser()))
options.put("replication_factor", factor.value());
return options;
}