cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [2/2] git commit: Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Date Fri, 12 Sep 2014 17:17:13 GMT
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 <brandonwilliams@apache.org>
Authored: Fri Sep 12 12:16:58 2014 -0500
Committer: Brandon Williams <brandonwilliams@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(-)
----------------------------------------------------------------------



Mime
View raw message