Commits

Anonymous committed 6a15bb3 Merge

Merge branch 'cassandra-1.2' into trunk

Comments (0)

Files changed (1)

src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java

 import org.apache.cassandra.io.sstable.Component;
 import org.apache.cassandra.io.sstable.SSTableReader;
 
-import com.google.common.collect.Sets;
-
 /**
  * Pluggable compaction strategy determines how SSTables get merged.
  *
                 float thresholdValue = Float.parseFloat(threshold);
                 if (thresholdValue < 0)
                 {
-                    throw new ConfigurationException(String.format("%s must be greater than 0, but was %d", TOMBSTONE_THRESHOLD_OPTION, thresholdValue));
+                    throw new ConfigurationException(String.format("%s must be greater than 0, but was %f", TOMBSTONE_THRESHOLD_OPTION, thresholdValue));
                 }
             }
             catch (NumberFormatException e)