Updated Branches: refs/heads/cassandra-1.2 1a93de3b3 -> 33ae0908a refs/heads/cassandra-1.2.0 b226ae593 -> 6cdbb2d7b refs/heads/trunk a8e848241 -> 58d5555af
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58d5555a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58d5555a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58d5555a Branch: refs/heads/trunk Commit: 58d5555af9b29627dd2f6413cdb966c295c3c25c Parents: a8e8482 33ae090 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Nov 18 21:20:35 2012 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Nov 18 21:20:35 2012 +0100 ---------------------------------------------------------------------- doc/cql3/CQL.textile | 2 +- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/58d5555a/src/java/org/apache/cassandra/cql3/CFPropDefs.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java index 61cefff,5b29a2a..65309d6 --- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java @@@ -42,9 -46,8 +42,9 @@@ public class CFPropDefs extends Propert public static final String KW_REPLICATEONWRITE = "replicate_on_write"; public static final String KW_CACHING = "caching"; 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"; + public static final String KW_COMPACTION = "compaction_strategy"; public static final String KW_COMPRESSION = "compression"; public static final String COMPACTION_STRATEGY_CLASS_KEY = "class";
