merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be89c8b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be89c8b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be89c8b1 Branch: refs/heads/trunk Commit: be89c8b181c71be3ffea5e43732dc5ed27be91b9 Parents: f733836 25da034 Author: Pavel Yaskevich <xe...@apache.org> Authored: Fri Apr 6 23:36:03 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Fri Apr 6 23:36:03 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/be89c8b1/CHANGES.txt ----------------------------------------------------------------------
