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-11 11:28:36 +07:00
parent e7752549d5 530c9f52c3
commit 51a6f0f7fa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,6 @@ public class SettingsCommandUser extends SettingsCommand
{
return ImmutableList.<Option>builder().add(ops, clustering, profile).addAll(parent.options()).build();
}
}
// CLI utility methods
@ -105,6 +104,7 @@ public class SettingsCommandUser extends SettingsCommand
{
GroupedOptions options = GroupedOptions.select(params,
new Options(new Uncertainty()),
new Options(new Duration()),
new Options(new Count()));
if (options == null)
{