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 cassandra-2.2

This commit is contained in:
Benjamin Lerer 2015-12-03 21:30:45 +01:00
parent 15f03ab446 b876424228
commit 7e3e1191b9
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -1,6 +1,7 @@
2.2.5
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
2.2.4
* Show CQL help in cqlsh in web browser (CASSANDRA-7225)

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();
File yamlFile = new File(yamlPath);
if (yamlFile.exists())
{
yamlPath = "file:///" + yamlFile.getAbsolutePath();
}
profile = StressProfile.load(URI.create(yamlPath));
profile = StressProfile.load(yamlFile.exists() ? yamlFile.toURI() : URI.create(yamlPath));
if (ratios.size() == 0)
throw new IllegalArgumentException("Must specify at least one command with a non-zero ratio");