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/54e42478 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54e42478 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54e42478 Branch: refs/heads/trunk Commit: 54e42478122e38c69ddf76b8f38b3dbe95e6c9f8 Parents: 17a4fbd 67d476d Author: Jake Luciani <[email protected]> Authored: Tue Oct 7 12:22:14 2014 -0400 Committer: Jake Luciani <[email protected]> Committed: Tue Oct 7 12:22:14 2014 -0400 ---------------------------------------------------------------------- tools/stress/src/org/apache/cassandra/stress/Stress.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
