cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xe...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 13 Mar 2014 21:57:17 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/46ed72d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/46ed72d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/46ed72d7

Branch: refs/heads/trunk
Commit: 46ed72d731906e11db785213c57399bbabd34482
Parents: 17af71e 92381fd
Author: Pavel Yaskevich <xedin@apache.org>
Authored: Thu Mar 13 14:57:11 2014 -0700
Committer: Pavel Yaskevich <xedin@apache.org>
Committed: Thu Mar 13 14:57:11 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../apache/cassandra/stress/StressAction.java   | 10 +++---
 .../cassandra/stress/settings/Command.java      | 32 ++++++++++++--------
 .../stress/settings/SettingsCommand.java        |  8 +++--
 .../cassandra/stress/settings/SettingsKey.java  |  2 +-
 .../cassandra/stress/settings/SettingsMisc.java |  5 +--
 .../cassandra/stress/settings/SettingsRate.java |  2 +-
 .../stress/settings/StressSettings.java         |  2 +-
 8 files changed, 38 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/46ed72d7/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message