cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Fri, 01 Aug 2014 20:50:47 GMT
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: c0fc6988267aedc42ba338783128fb912c426851
Parents: 63393eb 24f6f03
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Fri Aug 1 21:49:28 2014 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Fri Aug 1 21:49:28 2014 +0100

----------------------------------------------------------------------
 .../stress/settings/OptionAnyProbabilities.java        |  9 +++------
 .../stress/settings/OptionEnumProbabilities.java       |  9 +++++----
 .../settings/SettingsCommandPreDefinedMixed.java       |  9 +++++++--
 .../cassandra/stress/settings/SettingsCommandUser.java | 13 +++++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0fc6988/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandPreDefinedMixed.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0fc6988/tools/stress/src/org/apache/cassandra/stress/settings/SettingsCommandUser.java
----------------------------------------------------------------------


Mime
View raw message