Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ad1e0aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ad1e0aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ad1e0aa Branch: refs/heads/cassandra-3.0 Commit: 0ad1e0aaf665c5afb1a85d2d8b6dce73aaee772e Parents: 4cf97f4 ab62876 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Aug 21 10:52:35 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Aug 21 10:52:35 2015 -0400 ---------------------------------------------------------------------- .../db/compaction/LeveledCompactionStrategyTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ad1e0aa/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java ----------------------------------------------------------------------
