Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9d84f5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d84f5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9d84f5c Branch: refs/heads/trunk Commit: b9d84f5c02897d1e8757af889392c1ec40e05841 Parents: 255e5f1 8e4a6b7 Author: Robert Stupp <[email protected]> Authored: Fri Jun 5 16:05:58 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Fri Jun 5 16:05:58 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/db/commitlog/CommitLogStressTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
