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.2' into cassandra-3.0

This commit is contained in:
Benjamin Lerer 2015-12-03 21:36:33 +01:00
parent fffa6d8e66 7e3e1191b9
commit 4b01e8fc5c
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -29,6 +29,7 @@ Merged from 2.2:
* (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
Merged from 2.1: Merged from 2.1:
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
* Fix incremental repair hang when replica is down (CASSANDRA-10288) * Fix incremental repair hang when replica is down (CASSANDRA-10288)
* Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768) * Optimize the way we check if a token is repaired in anticompaction (CASSANDRA-10768)
* Add proper error handling to stream receiver (CASSANDRA-10774) * Add proper error handling to stream receiver (CASSANDRA-10774)

7
tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
View File

@ -55,12 +55,7 @@ public class SettingsCommandUser extends SettingsCommand
String yamlPath = options.profile.value(); String yamlPath = options.profile.value();
File yamlFile = new File(yamlPath); File yamlFile = new File(yamlPath);
if (yamlFile.exists()) profile = StressProfile.load(yamlFile.exists() ? yamlFile.toURI() : URI.create(yamlPath));
{
yamlPath = "file:///" + yamlFile.getAbsolutePath();
}
profile = StressProfile.load(URI.create(yamlPath));
if (ratios.size() == 0) if (ratios.size() == 0)
throw new IllegalArgumentException("Must specify at least one command with a non-zero ratio"); throw new IllegalArgumentException("Must specify at least one command with a non-zero ratio");