Commits

Anonymous committed 192b208 Merge

Merge branch 'cassandra-1.2' into trunk

  • Participants
  • Parent commits 58d5555, 2a41dcd

Comments (0)

Files changed (1)

File src/java/org/apache/cassandra/cql3/CFPropDefs.java

     public static final String KW_BF_FP_CHANCE = "bloom_filter_fp_chance";
     public static final String KW_MEMTABLE_FLUSH_PERIOD = "memtable_flush_period_in_ms";
 
-    public static final String KW_COMPACTION = "compaction_strategy";
+    public static final String KW_COMPACTION = "compaction";
     public static final String KW_COMPRESSION = "compression";
 
     public static final String COMPACTION_STRATEGY_CLASS_KEY = "class";