cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/6] git commit: Merge branch 'cassandra-1.2' into trunk
Date Sun, 18 Nov 2012 20:27:17 GMT
Updated Branches:
  refs/heads/cassandra-1.2 33ae0908a -> 2a41dcd00
  refs/heads/cassandra-1.2.0 6cdbb2d7b -> 6e332e340
  refs/heads/trunk 58d5555af -> 192b20875


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/192b2087
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/192b2087
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/192b2087

Branch: refs/heads/trunk
Commit: 192b20875df5399e9b26f1ceb499e04e3a40b507
Parents: 58d5555 2a41dcd
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Sun Nov 18 21:26:47 2012 +0100
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Sun Nov 18 21:26:47 2012 +0100

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/192b2087/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 65309d6,0b563cc..61cefff
--- 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_strategy";
+     public static final String KW_COMPACTION = "compaction";
      public static final String KW_COMPRESSION = "compression";
  
      public static final String COMPACTION_STRATEGY_CLASS_KEY = "class";


Mime
View raw message