cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-1.2' into trunk
Date Fri, 28 Dec 2012 15:37:35 GMT
Updated Branches:
  refs/heads/trunk 70e9bed7c -> d07735648


Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/CFPropDefs.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0773564
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0773564
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0773564

Branch: refs/heads/trunk
Commit: d07735648a6d72eb04f7c3ae8d8435409a017f80
Parents: 70e9bed d6a3845
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Dec 28 18:37:20 2012 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Fri Dec 28 18:37:20 2012 +0300

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0773564/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0773564/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 095de04,2cbcfde..cbe1561
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@@ -132,9 -116,6 +131,8 @@@ public class CFPropDefs extends Propert
          cfm.minCompactionThreshold(toInt(KW_MINCOMPACTIONTHRESHOLD, getCompactionOptions().get(KW_MINCOMPACTIONTHRESHOLD),
cfm.getMinCompactionThreshold()));
          cfm.maxCompactionThreshold(toInt(KW_MAXCOMPACTIONTHRESHOLD, getCompactionOptions().get(KW_MAXCOMPACTIONTHRESHOLD),
cfm.getMaxCompactionThreshold()));
          cfm.caching(CFMetaData.Caching.fromString(getString(KW_CACHING, cfm.getCaching().toString())));
 +        cfm.defaultTimeToLive(getInt(KW_DEFAULT_TIME_TO_LIVE, cfm.getDefaultTimeToLive()));
-         cfm.bloomFilterFpChance(getDouble(KW_BF_FP_CHANCE, cfm.getBloomFilterFpChance()));
 +        cfm.memtableFlushPeriod(getInt(KW_MEMTABLE_FLUSH_PERIOD, cfm.getMemtableFlushPeriod()));
  
          if (compactionStrategyClass != null)
          {


Mime
View raw message