You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/23 17:26:45 UTC
[1/2] git commit: Add isDense to CFMetaData#hashCode()
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 508db1e9d -> baae9b6c1
Add isDense to CFMetaData#hashCode()
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/618441b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/618441b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/618441b9
Branch: refs/heads/cassandra-2.1.0
Commit: 618441b9776bf1da3dcda76ce20dd04734dfab59
Parents: a5617d6
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:26:10 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Aug 23 18:26:10 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/618441b9/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 07c696f..eaec9c3 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -860,6 +860,7 @@ public final class CFMetaData
.append(populateIoCacheOnFlush)
.append(droppedColumns)
.append(triggers)
+ .append(isDense)
.toHashCode();
}
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by al...@apache.org.
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.0
Commit: baae9b6c1239a89829feaac1a428f4629d0032b9
Parents: 508db1e 618441b
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Aug 23 18:26:34 2014 +0300
Committer: Aleksey Yeschenko <al...@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();
}