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/7aaa390b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7aaa390b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7aaa390b Branch: refs/heads/trunk Commit: 7aaa390b943e20258237639729630c02eab0e38e Parents: e964c02 89338a1 Author: Pavel Yaskevich <[email protected]> Authored: Thu Mar 13 18:04:24 2014 -0700 Committer: Pavel Yaskevich <[email protected]> Committed: Thu Mar 13 18:04:24 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/cassandra/stress/Operation.java | 24 +++++++++++++++----- .../cassandra/stress/settings/SettingsLog.java | 9 +++++++- .../stress/util/SmartThriftClient.java | 12 ++++------ 4 files changed, 33 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aaa390b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aaa390b/tools/stress/src/org/apache/cassandra/stress/Operation.java ----------------------------------------------------------------------
