cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Date Wed, 11 Mar 2015 11:05:08 GMT
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2047b2ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2047b2ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2047b2ae

Branch: refs/heads/cassandra-2.1
Commit: 2047b2ae302e23070115319029d447a0473da964
Parents: 699b575 2206ffa
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Mar 11 12:04:06 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Mar 11 12:04:06 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  13 +-
 .../cassandra/config/ColumnDefinition.java      |   2 +-
 .../locator/AbstractReplicationStrategy.java    |   6 +
 .../org/apache/cassandra/stress/Operation.java  |   2 +-
 .../apache/cassandra/stress/StressAction.java   |  46 +++---
 .../apache/cassandra/stress/StressMetrics.java  |  83 +++++++----
 .../apache/cassandra/stress/StressProfile.java  |  15 +-
 .../stress/operations/FixedOpDistribution.java  |  10 ++
 .../stress/operations/OpDistribution.java       |   2 +
 .../operations/OpDistributionFactory.java       |   6 +-
 .../operations/SampledOpDistribution.java       |  17 +++
 .../SampledOpDistributionFactory.java           |  10 +-
 .../cassandra/stress/settings/Command.java      |  27 ++--
 .../cassandra/stress/settings/Option.java       |   1 +
 .../stress/settings/OptionAnyProbabilities.java |   5 +
 .../stress/settings/OptionDistribution.java     |  17 ++-
 .../cassandra/stress/settings/OptionMulti.java  |  15 +-
 .../settings/OptionRatioDistribution.java       |   5 +
 .../stress/settings/OptionReplication.java      |   2 +-
 .../stress/settings/SettingsCommand.java        |  48 ++++---
 .../settings/SettingsCommandPreDefined.java     |  12 +-
 .../stress/settings/SettingsCommandUser.java    |   5 +
 .../org/apache/cassandra/stress/util/Timer.java |  10 +-
 .../apache/cassandra/stress/util/Timing.java    |  75 ++++++----
 .../cassandra/stress/util/TimingInterval.java   | 102 +++++++++-----
 .../cassandra/stress/util/TimingIntervals.java  | 139 +++++++++++++++++++
 26 files changed, 511 insertions(+), 164 deletions(-)
----------------------------------------------------------------------



Mime
View raw message