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/e3fa11bf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3fa11bf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3fa11bf Branch: refs/heads/trunk Commit: e3fa11bf4ab5f29a78ca17a31841abc949335ece Parents: 7633d92 169b1cf Author: Jake Luciani <j...@apache.org> Authored: Fri Aug 1 09:33:46 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Fri Aug 1 09:33:46 2014 -0400 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3fa11bf/tools/stress/src/org/apache/cassandra/stress/StressProfile.java ----------------------------------------------------------------------
