cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Date Sat, 23 Aug 2014 15:28:15 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1.0


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

Branch: refs/heads/cassandra-2.1
Commit: baae9b6c1239a89829feaac1a428f4629d0032b9
Parents: 508db1e 618441b
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Sat Aug 23 18:26:34 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Sat Aug 23 18:26:34 2014 +0300

----------------------------------------------------------------------
 src/java/org/apache/cassandra/config/CFMetaData.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/baae9b6c/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/config/CFMetaData.java
index 70cd648,eaec9c3..aa8bc57
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@@ -945,11 -855,12 +945,12 @@@ public final class CFMetaDat
              .append(memtableFlushPeriod)
              .append(caching)
              .append(defaultTimeToLive)
 -            .append(indexInterval)
 +            .append(minIndexInterval)
 +            .append(maxIndexInterval)
              .append(speculativeRetry)
 -            .append(populateIoCacheOnFlush)
              .append(droppedColumns)
              .append(triggers)
+             .append(isDense)
              .toHashCode();
      }
  


Mime
View raw message