Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/924fb4d5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/924fb4d5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/924fb4d5 Branch: refs/heads/trunk Commit: 924fb4d50892707f86ee6939a3dd3f3dd47c3bce Parents: ca32e05 2af4fba Author: T Jake Luciani <j...@apache.org> Authored: Tue Dec 1 11:22:48 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Dec 1 11:22:48 2015 -0500 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
