Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34b893af Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34b893af Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34b893af Branch: refs/heads/trunk Commit: 34b893aff104a72d1d4cb1af6713eb5e5cc3d770 Parents: e5b64f8 0ad1e0a Author: Joshua McKenzie <[email protected]> Authored: Fri Aug 21 10:52:45 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Fri Aug 21 10:52:45 2015 -0400 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategyTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
