Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a42d4cad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a42d4cad Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a42d4cad Branch: refs/heads/trunk Commit: a42d4cada7e7496bad301263ec52a5d9e97c824b Parents: 748beaf 2383430 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Aug 27 22:45:37 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Aug 27 22:45:37 2013 -0500 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a42d4cad/tools/stress/src/org/apache/cassandra/stress/StressAction.java ----------------------------------------------------------------------
