You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/09/12 19:17:12 UTC
[1/2] git commit: Don't use _ as a reference
Repository: cassandra
Updated Branches:
refs/heads/trunk 1963b7f03 -> 965f5227b
Don't use _ as a reference
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/314b1f17
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/314b1f17
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/314b1f17
Branch: refs/heads/trunk
Commit: 314b1f177063a314ccba219c4406ad6df529dc4a
Parents: e775254
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 12:16:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 12:16:47 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/stress/settings/OptionDistribution.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/314b1f17/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java b/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
index fd307e9..6bb55ed 100644
--- a/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
+++ b/tools/stress/src/org/apache/cassandra/stress/settings/OptionDistribution.java
@@ -284,7 +284,7 @@ public class OptionDistribution extends Option
// over entire range, but this results in overly skewed distribution, so take sqrt
final double scale = (max - min) / findBounds.inverseCumulativeProbability(1d - Math.sqrt(1d/(max-min)));
return new QuantizedExtremeFactory(min, max, shape, scale, quantas);
- } catch (Exception _)
+ } catch (Exception e)
{
throw new IllegalArgumentException("Invalid parameter list for quantized extreme (Weibull) distribution: " + params);
}
[2/2] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Posted by br...@apache.org.
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/965f5227
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/965f5227
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/965f5227
Branch: refs/heads/trunk
Commit: 965f5227bb87db984a4c9b7f50cbac19379189f8
Parents: 314b1f1 1963b7f
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 12 12:16:58 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 12 12:16:58 2014 -0500
----------------------------------------------------------------------
.../cassandra/stress/settings/GroupedOptions.java | 16 ++++++++++++++++
.../cassandra/stress/settings/OptionSimple.java | 5 +++++
.../stress/settings/SettingsCommandPreDefined.java | 6 ++----
.../settings/SettingsCommandPreDefinedMixed.java | 7 ++-----
.../stress/settings/SettingsCommandUser.java | 9 ++++++---
5 files changed, 31 insertions(+), 12 deletions(-)
----------------------------------------------------------------------