Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC0C211908 for ; Sat, 23 Aug 2014 15:28:50 +0000 (UTC) Received: (qmail 45343 invoked by uid 500); 23 Aug 2014 15:28:50 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 45271 invoked by uid 500); 23 Aug 2014 15:28:50 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 45147 invoked by uid 99); 23 Aug 2014 15:28:50 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 Aug 2014 15:28:50 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 673629555BD; Sat, 23 Aug 2014 15:28:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Sat, 23 Aug 2014 15:28:51 -0000 Message-Id: <8982235961bf4c93bad208337793ba9e@git.apache.org> In-Reply-To: <87bce9322f394e92ab413ba8c0322e7a@git.apache.org> References: <87bce9322f394e92ab413ba8c0322e7a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0 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/trunk Commit: baae9b6c1239a89829feaac1a428f4629d0032b9 Parents: 508db1e 618441b Author: Aleksey Yeschenko Authored: Sat Aug 23 18:26:34 2014 +0300 Committer: Aleksey Yeschenko 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(); }