Updated Branches: refs/heads/trunk acc982322 -> d6933d6f2
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/d6933d6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d6933d6f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d6933d6f Branch: refs/heads/trunk Commit: d6933d6f22cdd670fc1ae72c471f323125525586 Parents: acc9823 be89c8b Author: Pavel Yaskevich <[email protected]> Authored: Fri Apr 6 23:38:08 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Fri Apr 6 23:38:08 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../src/org/apache/cassandra/stress/Stress.java | 2 +- .../org/apache/cassandra/stress/StressAction.java | 6 +++++- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d6933d6f/CHANGES.txt ----------------------------------------------------------------------
