Merge branch 'cassandra-3.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/c92dab52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c92dab52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c92dab52 Branch: refs/heads/trunk Commit: c92dab5222d8ae5e1c079a6ade1cb744c9cfadaf Parents: f55df0b 924fb4d Author: T Jake Luciani <j...@apache.org> Authored: Tue Dec 1 11:24:38 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Tue Dec 1 11:24:38 2015 -0500 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/StressProfile.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
