Updated Branches: refs/heads/trunk dfd05673c -> 4279ce466
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4279ce46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4279ce46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4279ce46 Branch: refs/heads/trunk Commit: 4279ce466452959b0329ae2d3048f36d184d6dde Parents: dfd0567 5c3db0d Author: Pavel Yaskevich <xe...@apache.org> Authored: Thu May 3 03:53:02 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Thu May 3 03:53:02 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 5 ++ .../src/org/apache/cassandra/stress/Stress.java | 7 ++- .../org/apache/cassandra/stress/StressAction.java | 34 ++++++++++++++- 3 files changed, 42 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4279ce46/CHANGES.txt ----------------------------------------------------------------------
