[3/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

[slebresne]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/a30d8bd2/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
----------------------------------------------------------------------
diff --cc 
test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
index 5420b1b,572ad36..2b6a62a
--- 
a/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
+++ 
b/test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
@@@ -22,11 -22,8 +22,9 @@@ package org.apache.cassandra.db.compact
  
  
  import java.io.RandomAccessFile;
- import java.util.Collection;
- import java.util.HashSet;
- import java.util.Set;
+ import java.util.*;
  
 +import org.apache.cassandra.io.sstable.format.SSTableReader;
  import org.junit.After;
  import org.junit.AfterClass;
  import org.junit.BeforeClass;
@@@ -43,12 -38,12 +41,13 @@@ import org.apache.cassandra.utils.ByteB
  
  import static org.junit.Assert.assertEquals;
  import static org.junit.Assert.assertNotNull;
+ import static org.junit.Assert.assertTrue;
  import static org.apache.cassandra.Util.cellname;
  
 -public class BlacklistingCompactionsTest extends SchemaLoader
 +public class BlacklistingCompactionsTest
  {
 -    public static final String KEYSPACE = "Keyspace1";
 +    private static final String KEYSPACE1 = "BlacklistingCompactionsTest";
 +    private static final String CF_STANDARD1 = "Standard1";
  
      @After
      public void leakDetect() throws InterruptedException